Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 22:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qgraph: fix qos_node_contains with options

Browse Source 
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: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-03-18 17:14:12 +01:00
parent de94b54aa0
commit 7d8ada6e4d
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/libqos/qgraph.c
View File

@ -632,15 +632,19 @@ void qos_node_create_driver(const char *name, QOSCreateDriverFunc function)
} }
void qos_node_contains(const char *container, const char *contained, void qos_node_contains(const char *container, const char *contained,
...) QOSGraphEdgeOptions *opts, ...)
{ {
va_list va; 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 { do {
opts = va_arg(va, QOSGraphEdgeOptions *);
add_edge(container, contained, QEDGE_CONTAINS, opts); add_edge(container, contained, QEDGE_CONTAINS, opts);
opts = va_arg(va, QOSGraphEdgeOptions *);
} while (opts != NULL); } while (opts != NULL);
va_end(va); va_end(va);

15
tests/libqos/qgraph.h
View File

@ -453,14 +453,16 @@ void qos_node_create_machine_args(const char *name,
void qos_node_create_driver(const char *name, QOSCreateDriverFunc function); void qos_node_create_driver(const char *name, QOSCreateDriverFunc function);
/** /**
* qos_node_contains(): creates an edge of type QEDGE_CONTAINS and * qos_node_contains(): creates one or more edges of type QEDGE_CONTAINS
* adds it to the edge list mapped to @container in the * and adds them to the edge list mapped to @container in the
* edge hash table. * 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 * If @opts is NULL, a single edge will be added with no options.
* @opts parameters (see %QOSGraphEdgeOptions) * 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 * This function can be useful when there are multiple devices
* with the same node name contained in a machine/other node * 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 * For contains, op1.arg and op1.size_arg represent the arg to pass
* to @contained constructor to properly initialize it. * 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 * qos_node_produces(): creates an edge of type QEDGE_PRODUCES and