Introduce qemuMonitorJSONFindLinkPath

When traversing through the QOM tree, we're looking for
a link to a device, e.g.:
link<virtio-balloon-pci>

Introduce a helper that will format the link name at the start,
instead of doing it every time while recursing through the tree.

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index d761f51fe932587a7d7b5a7e92e9caef8c9befb5..4a5e13c491ea69a429d3ad6f394cf64a4b52029e 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1111,7 +1111,7 @@ qemuMonitorFindBalloonObjectPath(qemuMonitorPtr mon,
         return -1;
     }
 
-    if (qemuMonitorJSONFindObjectPath(mon, curpath, "virtio-balloon-pci", &path) < 0)
+    if (qemuMonitorJSONFindLinkPath(mon, curpath, "virtio-balloon-pci", &path) < 0)
         return -1;
 
     nprops = qemuMonitorJSONGetObjectListPaths(mon, path, &bprops);
@@ -1160,7 +1160,7 @@ qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon,
     QEMU_CHECK_MONITOR(mon);
 
     if (mon->json) {
-        ret = qemuMonitorJSONFindObjectPath(mon, "/", videoName, &path);
+        ret = qemuMonitorJSONFindLinkPath(mon, "/", videoName, &path);
         if (ret < 0) {
             if (ret == -2)
                 virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 69c342d819eb80346bf9801de8b353ddcf6a57af..6fafe81e55ffd7996e907ede50fb0198b6330b31 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6645,21 +6645,18 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon,
 
 
 /**
- * Search the qom objects by it's known name.  The name is compared against
- * filed 'type' formatted as 'link<%name>'.
+ * Recursively search for a QOM object link.
  *
- * This procedure will be call recursively until found or the qom-list is
- * exhausted.
+ * For @name, this function finds the first QOM object
+ * named @name, recursively going through all the "child<>"
+ * entries, starting from @curpath.
  *
  * Returns:
- *
  *   0  - Found
- *  -1  - Error bail out
+ *  -1  - Error - bail out
  *  -2  - Not found
- *
- * NOTE: This assumes we have already called qemuDomainObjEnterMonitor()
  */
-int
+static int
 qemuMonitorJSONFindObjectPath(qemuMonitorPtr mon,
                               const char *curpath,
                               const char *name,
@@ -6668,13 +6665,9 @@ qemuMonitorJSONFindObjectPath(qemuMonitorPtr mon,
     ssize_t i, npaths = 0;
     int ret = -2;
     char *nextpath = NULL;
-    char *type = NULL;
     qemuMonitorJSONListPathPtr *paths = NULL;
 
-    if (virAsprintf(&type, "link<%s>", name) < 0)
-        return -1;
-
-    VIR_DEBUG("Searching for '%s' Object Path starting at '%s'", type, curpath);
+    VIR_DEBUG("Searching for '%s' Object Path starting at '%s'", name, curpath);
 
     npaths = qemuMonitorJSONGetObjectListPaths(mon, curpath, &paths);
     if (npaths < 0)
@@ -6682,8 +6675,8 @@ qemuMonitorJSONFindObjectPath(qemuMonitorPtr mon,
 
     for (i = 0; i < npaths && ret == -2; i++) {
 
-        if (STREQ_NULLABLE(paths[i]->type, type)) {
-            VIR_DEBUG("Path to '%s' is '%s/%s'", type, curpath, paths[i]->name);
+        if (STREQ_NULLABLE(paths[i]->type, name)) {
+            VIR_DEBUG("Path to '%s' is '%s/%s'", name, curpath, paths[i]->name);
             ret = 0;
             if (virAsprintf(path, "%s/%s", curpath, paths[i]->name) < 0) {
                 *path = NULL;
@@ -6711,6 +6704,34 @@ qemuMonitorJSONFindObjectPath(qemuMonitorPtr mon,
         qemuMonitorJSONListPathFree(paths[i]);
     VIR_FREE(paths);
     VIR_FREE(nextpath);
-    VIR_FREE(type);
+    return ret;
+}
+
+
+/**
+ * Recursively search for a QOM object link.
+ *
+ * For @name, this function finds the first QOM object
+ * pointed to by a link in the form of 'link<@name>'
+ *
+ * Returns:
+ *   0  - Found
+ *  -1  - Error
+ *  -2  - Not found
+ */
+int
+qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon,
+                            const char *curpath,
+                            const char *name,
+                            char **path)
+{
+    char *linkname = NULL;
+    int ret = -1;
+
+    if (virAsprintf(&linkname, "link<%s>", name) < 0)
+        return -1;
+
+    ret = qemuMonitorJSONFindObjectPath(mon, curpath, linkname, path);
+    VIR_FREE(linkname);
     return ret;
 }

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index fcc2c86968fc0feacc127cc8be04797c78b8a322..ab7cb282887ee74ee6397a6ce6eeab160be07458 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -482,8 +482,9 @@ int qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon,
                                        virHashTablePtr info)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-int qemuMonitorJSONFindObjectPath(qemuMonitorPtr mon,
-                                  const char *curpath,
-                                  const char *name,
-                                  char **path);
+int qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon,
+                                const char *curpath,
+                                const char *name,
+                                char **path)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
 #endif /* QEMU_MONITOR_JSON_H */