Add a qemuMonitorGetTargetArch() method for QMP query-target command

Add a new qemuMonitorGetTargetArch() method to support invocation
of the 'query-target' JSON monitor command. No HMP equivalent
is required, since this will only be present for QEMU >= 1.2

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index d253a4cf65280140b0c5ed863f30eeb586039508..36289d2cccb64bcaf4c63e414aa9da36d363bc31 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3186,3 +3186,24 @@ int qemuMonitorGetObjectProps(qemuMonitorPtr mon,
 
     return qemuMonitorJSONGetObjectProps(mon, type, props);
 }
+
+
+char *qemuMonitorGetTargetArch(qemuMonitorPtr mon)
+{
+    VIR_DEBUG("mon=%p",
+              mon);
+
+    if (!mon) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("monitor must not be NULL"));
+        return NULL;
+    }
+
+    if (!mon->json) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("JSON monitor is required"));
+        return NULL;
+    }
+
+    return qemuMonitorJSONGetTargetArch(mon);
+}

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index e65a21843e84cb1a930c3d0de2a628b885a37197..65ea358bd5e18a960b39afb67975333b26d51d38 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -606,7 +606,7 @@ int qemuMonitorGetObjectTypes(qemuMonitorPtr mon,
 int qemuMonitorGetObjectProps(qemuMonitorPtr mon,
                               const char *type,
                               char ***props);
-
+char *qemuMonitorGetTargetArch(qemuMonitorPtr mon);
 
 /**
  * When running two dd process and using <> redirection, we need a

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b5f6b1aee75c37f0bb7662debc3c5e4a9d42301c..43b003dc13dd4079653a72bfbee0136386bad0ab 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4374,3 +4374,48 @@ cleanup:
     virJSONValueFree(reply);
     return ret;
 }
+
+
+char *
+qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon)
+{
+    char *ret = NULL;
+    int rv;
+    const char *arch;
+    virJSONValuePtr cmd;
+    virJSONValuePtr reply = NULL;
+    virJSONValuePtr data;
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-target", NULL)))
+        return NULL;
+
+    rv = qemuMonitorJSONCommand(mon, cmd, &reply);
+
+    if (rv == 0)
+        rv = qemuMonitorJSONCheckError(cmd, reply);
+
+    if (rv < 0)
+        goto cleanup;
+
+    if (!(data = virJSONValueObjectGet(reply, "return"))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-target reply was missing return data"));
+        goto cleanup;
+    }
+
+    if (!(arch = virJSONValueObjectGetString(data, "arch"))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-target reply was missing arch data"));
+        goto cleanup;
+    }
+
+    if (!(ret = strdup(arch))) {
+        virReportOOMError();
+        goto cleanup;
+    }
+
+cleanup:
+    virJSONValueFree(cmd);
+    virJSONValueFree(reply);
+    return ret;
+}

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index dde02fe0e2cebd8299678b9f651a3a904d6d483c..546b6afefd8417e7a0ef8f8fba6e7eef176ad3e7 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -312,5 +312,6 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
                                   const char *type,
                                   char ***props)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon);
 
 #endif /* QEMU_MONITOR_JSON_H */