From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 20 Jul 2022 09:26:12 +0000 (+0200)
Subject: qemu: monitor: Remove unused qemuMonitorQueryNamedBlockNodes and clean up
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4bcff43bc77a16e4a0c5ae99e1aa8268e7b0139d;p=libvirt.git

qemu: monitor: Remove unused qemuMonitorQueryNamedBlockNodes and clean up

The top level API is unused so it can be removed but internally the JSON
version is called by other monitor commands which extract information
from the reply.

Thus qemuMonitorJSONQueryNamedBlockNodes is unexported and moved
appropriately.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index e55f753610..31f7253c3c 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3945,15 +3945,6 @@ qemuMonitorSetBlockThreshold(qemuMonitor *mon,
 }
 
 
-virJSONValue *
-qemuMonitorQueryNamedBlockNodes(qemuMonitor *mon)
-{
-    QEMU_CHECK_MONITOR_NULL(mon);
-
-    return qemuMonitorJSONQueryNamedBlockNodes(mon, false);
-}
-
-
 char *
 qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfo *info)
 {
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 9acc7c0aa4..a756b286e9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1331,8 +1331,6 @@ int qemuMonitorSetBlockThreshold(qemuMonitor *mon,
                                  const char *nodename,
                                  unsigned long long threshold);
 
-virJSONValue *qemuMonitorQueryNamedBlockNodes(qemuMonitor *mon);
-
 int qemuMonitorSetWatchdogAction(qemuMonitor *mon,
                                  const char *action);
 
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0fc371f57c..06a10c4ad4 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2028,6 +2028,36 @@ qemuMonitorJSONSetDBusVMStateIdList(qemuMonitor *mon,
 }
 
 
+/* qemuMonitorJSONQueryNamedBlockNodes:
+ * @mon: Monitor pointer
+ *
+ * This helper will attempt to make a "query-named-block-nodes" call and check for
+ * errors before returning with the reply.
+ *
+ * Returns: NULL on error, reply on success
+ */
+static virJSONValue *
+qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon,
+                                    bool flat)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-named-block-nodes",
+                                           "B:flat", flat,
+                                           NULL)))
+        return NULL;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return NULL;
+
+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
+        return NULL;
+
+    return virJSONValueObjectStealArray(reply, "return");
+}
+
+
 /* qemuMonitorJSONQueryBlock:
  * @mon: Monitor pointer
  *
@@ -7854,28 +7884,6 @@ qemuMonitorJSONSetBlockThreshold(qemuMonitor *mon,
 }
 
 
-virJSONValue *
-qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon,
-                                    bool flat)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    if (!(cmd = qemuMonitorJSONMakeCommand("query-named-block-nodes",
-                                           "B:flat", flat,
-                                           NULL)))
-        return NULL;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return NULL;
-
-    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
-        return NULL;
-
-    return virJSONValueObjectStealArray(reply, "return");
-}
-
-
 int
 qemuMonitorJSONSetWatchdogAction(qemuMonitor *mon,
                                  const char *action)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 44456d878b..dee1b93f8b 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -712,11 +712,6 @@ qemuMonitorJSONSetBlockThreshold(qemuMonitor *mon,
                                  unsigned long long threshold)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-virJSONValue *
-qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon,
-                                    bool flat)
-    ATTRIBUTE_NONNULL(1);
-
 int
 qemuMonitorJSONSetWatchdogAction(qemuMonitor *mon,
                                  const char *action)