Commit 7d8ada6e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qgraph: fix qos_node_contains with options 



Currently, if qos_node_contains was passed options, it would still
create an edge without any options.  Instead, in that case
NULL acts as a terminator.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent de94b54a

tests/libqos/qgraph.c

+8 −4
Original line number Diff line number Diff line
@@ -632,15 +632,19 @@ void qos_node_create_driver(const char *name, QOSCreateDriverFunc function) 
}



void qos_node_contains(const char *container, const char *contained,

                       ...)

                       QOSGraphEdgeOptions *opts, ...)

{

    va_list va;

    va_start(va, contained);

    QOSGraphEdgeOptions *opts;



    if (opts == NULL) {

        add_edge(container, contained, QEDGE_CONTAINS, NULL);

        return;

    }



    va_start(va, opts);

    do {

        opts = va_arg(va, QOSGraphEdgeOptions *);

        add_edge(container, contained, QEDGE_CONTAINS, opts);

        opts = va_arg(va, QOSGraphEdgeOptions *);

    } while (opts != NULL);



    va_end(va);

tests/libqos/qgraph.h

+9 −6
Original line number Diff line number Diff line
@@ -453,14 +453,16 @@ void qos_node_create_machine_args(const char *name, 
void qos_node_create_driver(const char *name, QOSCreateDriverFunc function);



/**

 * qos_node_contains(): creates an edge of type QEDGE_CONTAINS and

 * adds it to the edge list mapped to @container in the

 * qos_node_contains(): creates one or more edges of type QEDGE_CONTAINS

 * and adds them to the edge list mapped to @container in the

 * edge hash table.

 *

 * This edge will have @container as source and @contained as destination.

 * The edges will have @container as source and @contained as destination.

 *

 * It also has the possibility to add optional NULL-terminated

 * @opts parameters (see %QOSGraphEdgeOptions)

 * If @opts is NULL, a single edge will be added with no options.

 * If @opts is non-NULL, the arguments after @contained represent a

 * NULL-terminated list of %QOSGraphEdgeOptions structs, and an

 * edge will be added for each of them.

 *

 * This function can be useful when there are multiple devices

 * with the same node name contained in a machine/other node
@@ -480,7 +482,8 @@ void qos_node_create_driver(const char *name, QOSCreateDriverFunc function); 
 * For contains, op1.arg and op1.size_arg represent the arg to pass

 * to @contained constructor to properly initialize it.

 */

void qos_node_contains(const char *container, const char *contained, ...);

void qos_node_contains(const char *container, const char *contained,

                       QOSGraphEdgeOptions *opts, ...);



/**

 * qos_node_produces(): creates an edge of type QEDGE_PRODUCES and