From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 24 Sep 2021 16:58:33 +0000 (+0200)
Subject: testCompareXMLToArgvValidateSchema: Base -netdev validation on JSON
X-Git-Tag: v7.9.0-rc1~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36253a48b4b8fa1cdae2c286826483abb2d17873;p=thirdparty%2Flibvirt.git

testCompareXMLToArgvValidateSchema: Base -netdev validation on JSON

Base the validation on presence of JSON as we do with other validated
commands. This will prepare the code for a refactor so that it's the
same for all validated commands.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ec7bb3074e..660ca4148c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -503,7 +503,6 @@ testCompareXMLToArgvValidateSchema(virQEMUDriver *drv,
     GHashTable *schema = NULL;
     g_autoptr(virCommand) cmd = NULL;
     unsigned int parseFlags = info->parseFlags;
-    bool netdevQAPIfied = false;
 
     /* comment out with line comment to enable schema checking for non _CAPS tests
     if (!info->schemafile)
@@ -546,8 +545,6 @@ testCompareXMLToArgvValidateSchema(virQEMUDriver *drv,
     if (virCommandGetArgList(cmd, &args, &nargs) < 0)
         return -1;
 
-    netdevQAPIfied = !virQEMUQAPISchemaPathExists("netdev_add/arg-type/type/!string", schema);
-
     for (i = 0; i < nargs; i++) {
         g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
         g_autoptr(virJSONValue) jsonargs = NULL;
@@ -565,7 +562,7 @@ testCompareXMLToArgvValidateSchema(virQEMUDriver *drv,
 
             i++;
         } else if (STREQ(args[i], "-netdev")) {
-            if (!netdevQAPIfied) {
+            if (*args[i + 1] != '{') {
                 i++;
                 continue;
             }