5:46 a.m.
This function fetches status of all pr-managers. So far, qemu
reports only a single attribute "connected" but that fits our
needs.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_monitor.c | 25 ++++++++++++
src/qemu/qemu_monitor.h | 9 +++++
src/qemu/qemu_monitor_json.c | 90 ++++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_monitor_json.h | 4 ++
4 files changed, 128 insertions(+)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index ca95f6f94a..3514e9f8a1 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4335,3 +4335,28 @@ qemuMonitorGetSEVMeasurement(qemuMonitorPtr mon)
return qemuMonitorJSONGetSEVMeasurement(mon);
}
+
+
+int
+qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
+ virHashTablePtr *retinfo)
+{
+ int ret = -1;
+ virHashTablePtr info = NULL;
+
+ *retinfo = NULL;
+
+ QEMU_CHECK_MONITOR(mon);
+
+ if (!(info = virHashCreate(10, virHashValueFree)))
+ goto cleanup;
+
+ if (qemuMonitorJSONGetPRManagerInfo(mon, info) < 0)
+ goto cleanup;
+
+ VIR_STEAL_PTR(*retinfo, info);
+ ret = 0;
+ cleanup:
+ virHashFree(info);
+ return ret;
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index f1ea0bc541..e588d73678 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1156,4 +1156,13 @@ int qemuMonitorBlockdevDel(qemuMonitorPtr mon,
char *
qemuMonitorGetSEVMeasurement(qemuMonitorPtr mon);
+typedef struct _qemuMonitorPRManagerInfo qemuMonitorPRManagerInfo;
+typedef qemuMonitorPRManagerInfo *qemuMonitorPRManagerInfoPtr;
+struct _qemuMonitorPRManagerInfo {
+ bool connected;
+};
+
+int qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
+ virHashTablePtr *retinfo);
+
#endif /* QEMU_MONITOR_H */
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 03c94cd88b..460312a067 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -8065,3 +8065,93 @@ qemuMonitorJSONGetSEVMeasurement(qemuMonitorPtr mon)
virJSONValueFree(reply);
return measurement;
}
+
+
+/*
+ * Example return data
+ *
+ * "return": [
+ * { "connected": true, "id": "pr-helper0" }
+ * ]}
+ *
+ */
+static int
+qemuMonitorJSONExtractPRManagerInfo(virJSONValuePtr reply,
+ virHashTablePtr info)
+{
+ qemuMonitorPRManagerInfoPtr entry = NULL;
+ virJSONValuePtr data;
+ int ret = -1;
+ size_t i;
+
+ data = virJSONValueObjectGetArray(reply, "return");
+
+ for (i = 0; i < virJSONValueArraySize(data); i++) {
+ virJSONValuePtr prManager = virJSONValueArrayGet(data, i);
+ const char *alias;
+
+ if (!prManager) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("prManager information was missing array
element"));
+ goto cleanup;
+ }
+
+ if (!(alias = virJSONValueObjectGetString(prManager, "id"))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("prManager information was missing id"));
+ goto cleanup;
+ }
+
+ if (VIR_ALLOC(entry) < 0)
+ goto cleanup;
+
+ if (virJSONValueObjectGetBoolean(prManager,
+ "connected",
+ &entry->connected) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("prManager information was missing connected"));
+ goto cleanup;
+ }
+
+ if (virHashAddEntry(info, alias, entry) < 0) {
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("failed to add chardev '%s' info"),
alias);
+ VIR_FREE(entry);
+ goto cleanup;
+ }
+
+ entry = NULL;
+ }
+
+ ret = 0;
+ cleanup:
+ VIR_FREE(entry);
+ return ret;
+}
+
+
+int
+qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon,
+ virHashTablePtr info)
+{
+ int ret = -1;
+ virJSONValuePtr cmd;
+ virJSONValuePtr reply = NULL;
+
+ if (!(cmd = qemuMonitorJSONMakeCommand("query-pr-managers",
+ NULL)))
+ return -1;
+
+ if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+ goto cleanup;
+
+ if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
+ goto cleanup;
+
+ ret = qemuMonitorJSONExtractPRManagerInfo(reply, info);
+ cleanup:
+ virJSONValueFree(cmd);
+ virJSONValueFree(reply);
+ return ret;
+
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 6bc0dd3ad2..66536ceb97 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -550,4 +550,8 @@ int qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
const char *nodename)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+int qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon,
+ virHashTablePtr info)
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+
#endif /* QEMU_MONITOR_JSON_H */
--
2.16.4