Re: [libvirt] [PATCH 07/21] qemu: qapi: Convert virQEMUQAPISchemaTraverse to recursive lookup

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_qapi.c | 88 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 23cbac4405..2652061f4e 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -107,68 +107,66 @@ virQEMUQAPISchemaTraverse(const char *baseName,

+ "name", curtype); - if (!baseName) + if (modifier == '*' && + !virJSONValueObjectHasKey(obj, "default")) return 0; - } else if (STREQ(metatype, "command") || - STREQ(metatype, "event")) { - if (!(baseName = virJSONValueObjectGetString(base, *query))) - return 0;

- } else { - /* alternates, basic types and enums can't be entered */ - return 0; - } + querytype = virQEMUQAPISchemaTypeFromObject(obj); + } query++;