From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 17 Sep 2021 14:26:09 +0000 (+0200)
Subject: testQEMUSchemaValidateEnum: Use new 'members' for 'enum' meta type
X-Git-Tag: v7.10.0-rc1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf68184e74e3b07b3d5f4e1d4b10cb7c484bcc91;p=thirdparty%2Flibvirt.git

testQEMUSchemaValidateEnum: Use new 'members' for 'enum' meta type

Switch to the new more featured way to report enum members which will
also allow us to detect use of deprecated members.

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

diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c
index 82c5994604..dfb1add90b 100644
--- a/tests/testutilsqemuschema.c
+++ b/tests/testutilsqemuschema.c
@@ -324,6 +324,7 @@ testQEMUSchemaValidateEnum(virJSONValue *obj,
 {
     const char *objstr;
     virJSONValue *values = NULL;
+    virJSONValue *members = NULL;
     size_t i;
 
     if (virJSONValueGetType(obj) != VIR_JSON_TYPE_STRING) {
@@ -333,6 +334,22 @@ testQEMUSchemaValidateEnum(virJSONValue *obj,
 
     objstr = virJSONValueGetString(obj);
 
+    /* qemu-6.2 added a "members" array superseding "values" */
+    if ((members = virJSONValueObjectGetArray(root, "members"))) {
+        for (i = 0; i < virJSONValueArraySize(members); i++) {
+            virJSONValue *member = virJSONValueArrayGet(members, i);
+
+            if (STREQ_NULLABLE(objstr, virJSONValueObjectGetString(member, "name"))) {
+                virBufferAsprintf(ctxt->debug, "'%s' OK", NULLSTR(objstr));
+                return 0;
+            }
+        }
+
+        virBufferAsprintf(ctxt->debug, "ERROR: enum value '%s' is not in schema",
+                          NULLSTR(objstr));
+        return -1;
+    }
+
     if ((values = virJSONValueObjectGetArray(root, "values"))) {
         for (i = 0; i < virJSONValueArraySize(values); i++) {
             virJSONValue *value = virJSONValueArrayGet(values, i);