From c3944f8fe7188237cc1d5dfe30fb97d651c75433 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 10 Apr 2019 14:22:14 +0200
Subject: [PATCH] qemu: qapi: Use declarative approach for meta-type parsers in
 virQEMUQAPISchemaTraverse
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce an array of callbacks for given 'meta-type' of the QAPI schema
structure rather than using code to select it. This will simplify
extension for the other meta-types which are not handled yet.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_qapi.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c
index a03aab7f9b..9a5becb26f 100644
--- a/src/qemu/qemu_qapi.c
+++ b/src/qemu/qemu_qapi.c
@@ -164,12 +164,30 @@ virQEMUQAPISchemaTraverseCommand(virJSONValuePtr cur,
 }
 
 
+typedef int (*virQEMUQAPISchemaTraverseFunc)(virJSONValuePtr cur,
+                                             struct virQEMUQAPISchemaTraverseContext *ctxt);
+
+struct virQEMUQAPISchemaTraverseMetaType {
+    const char *metatype;
+    virQEMUQAPISchemaTraverseFunc func;
+};
+
+
+static const struct virQEMUQAPISchemaTraverseMetaType traverseMetaType[] = {
+    { "object", virQEMUQAPISchemaTraverseObject },
+    { "array", virQEMUQAPISchemaTraverseArray },
+    { "command", virQEMUQAPISchemaTraverseCommand },
+    { "event", virQEMUQAPISchemaTraverseCommand },
+};
+
+
 static int
 virQEMUQAPISchemaTraverse(const char *baseName,
                           struct virQEMUQAPISchemaTraverseContext *ctxt)
 {
     virJSONValuePtr cur;
     const char *metatype;
+    size_t i;
 
     if (!(cur = virHashLookup(ctxt->schema, baseName)))
         return 0;
@@ -182,16 +200,9 @@ virQEMUQAPISchemaTraverse(const char *baseName,
     if (!(metatype = virJSONValueObjectGetString(cur, "meta-type")))
         return 0;
 
-    if (STREQ(metatype, "array")) {
-        return virQEMUQAPISchemaTraverseArray(cur, ctxt);
-    } else if (STREQ(metatype, "object")) {
-        return virQEMUQAPISchemaTraverseObject(cur, ctxt);
-    } else if (STREQ(metatype, "command") ||
-               STREQ(metatype, "event")) {
-        return virQEMUQAPISchemaTraverseCommand(cur, ctxt);
-    } else {
-        /* alternates, basic types and enums can't be entered */
-        return 0;
+    for (i = 0; i < ARRAY_CARDINALITY(traverseMetaType); i++) {
+        if (STREQ(metatype, traverseMetaType[i].metatype))
+            return traverseMetaType[i].func(cur, ctxt);
     }
 
     return 0;