[RFC PATCH 5/7] 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(a)redhat.com>
---
tests/testutilsqemuschema.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c
index e75345b582..7398c73ccc 100644
--- a/tests/testutilsqemuschema.c
+++ b/tests/testutilsqemuschema.c
@@ -319,6 +319,7 @@ testQEMUSchemaValidateEnum(virJSONValue *obj,
{
const char *objstr;
virJSONValue *values = NULL;
+ virJSONValue *members = NULL;
size_t i;
if (virJSONValueGetType(obj) != VIR_JSON_TYPE_STRING) {
@@ -328,6 +329,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);
--
2.31.1