On 18/03/2019 18.15, Paolo Bonzini wrote:
> 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 <pbonz...@redhat.com>
> ---
> tests/libqos/qgraph.c | 12 ++++++++----
> tests/libqos/qgraph.h | 15 +++++++++------
> 2 files changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/tests/libqos/qgraph.c b/tests/libqos/qgraph.c
> index 122efc1b7b..9f738f1849 100644
> --- a/tests/libqos/qgraph.c
> +++ b/tests/libqos/qgraph.c
> @@ -630,15 +630,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, contained);
As patchew complained - you've got to either replace "contained" with
"opts" here, or switch the order of the options in the prototype.
Thomas
