From: Peter Krempa <pkrempa@redhat.com> The query commands are not used since we can probe the supported types and models via qom types. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 24 ------------------ src/qemu/qemu_monitor.h | 6 ----- src/qemu/qemu_monitor_json.c | 43 --------------------------------- src/qemu/qemu_monitor_json.h | 10 -------- tests/qemumonitorjsontest.c | 47 ------------------------------------ 5 files changed, 130 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c1fef8d5de..3adce735e1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3585,30 +3585,6 @@ qemuMonitorBlockExportAdd(qemuMonitor *mon, } -int -qemuMonitorGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) -{ - VIR_DEBUG("tpmmodels=%p", tpmmodels); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONGetTPMModels(mon, tpmmodels); -} - - -int -qemuMonitorGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) -{ - VIR_DEBUG("tpmtypes=%p", tpmtypes); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONGetTPMTypes(mon, tpmtypes); -} - - int qemuMonitorAttachCharDev(qemuMonitor *mon, virJSONValue **props, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 755f347e17..8061b95bf2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1242,12 +1242,6 @@ int qemuMonitorNBDServerStop(qemuMonitor *mon); int qemuMonitorBlockExportAdd(qemuMonitor *mon, virJSONValue **props); -int qemuMonitorGetTPMModels(qemuMonitor *mon, - char ***tpmmodels); - -int qemuMonitorGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes); - int qemuMonitorAttachCharDev(qemuMonitor *mon, virJSONValue **props, char **ptypath); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9f51421478..54c4e80578 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6496,49 +6496,6 @@ qemuMonitorJSONBlockExportAdd(qemuMonitor *mon, } -static int -qemuMonitorJSONGetStringArray(qemuMonitor *mon, - const char *qmpCmd, - char ***array) -{ - g_autoptr(virJSONValue) cmd = NULL; - g_autoptr(virJSONValue) reply = NULL; - virJSONValue *data; - - *array = NULL; - - if (!(cmd = qemuMonitorJSONMakeCommand(qmpCmd, NULL))) - return -1; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - return -1; - - if (qemuMonitorJSONHasError(reply, "CommandNotFound")) - return 0; - - if (!(data = qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY))) - return -1; - - if (!(*array = virJSONValueArrayToStringList(data))) - return -1; - - return 0; -} - -int qemuMonitorJSONGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) -{ - return qemuMonitorJSONGetStringArray(mon, "query-tpm-models", tpmmodels); -} - - -int qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) -{ - return qemuMonitorJSONGetStringArray(mon, "query-tpm-types", tpmtypes); -} - - int qemuMonitorJSONAttachCharDev(qemuMonitor *mon, virJSONValue **props, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index bd437f7938..f076e637ba 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -546,16 +546,6 @@ int qemuMonitorJSONBlockExportAdd(qemuMonitor *mon, virJSONValue **props); -int -qemuMonitorJSONGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) - ATTRIBUTE_NONNULL(2); - -int -qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) - ATTRIBUTE_NONNULL(2); - int qemuMonitorJSONAttachCharDev(qemuMonitor *mon, virJSONValue **props, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index a18872db60..df64b1f115 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -492,52 +492,6 @@ testQemuMonitorJSONGetCPUDefinitions(const void *opaque) } -static int -testQemuMonitorJSONGetTPMModels(const void *opaque) -{ - const testGenericData *data = opaque; - virDomainXMLOption *xmlopt = data->xmlopt; - g_auto(GStrv) tpmmodels = NULL; - g_autoptr(qemuMonitorTest) test = NULL; - - if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) - return -1; - - if (qemuMonitorTestAddItem(test, "query-tpm-models", - "{ " - " \"return\": [ " - " \"passthrough\"" - " ]" - "}") < 0) - return -1; - - if (qemuMonitorGetTPMModels(qemuMonitorTestGetMonitor(test), &tpmmodels) < 0) - return -1; - - if (g_strv_length(tpmmodels) != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "expected 1 tpm model"); - return -1; - } - -#define CHECK(i, wantname) \ - do { \ - if (STRNEQ(tpmmodels[i], (wantname))) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ - "name %s is not %s", \ - tpmmodels[i], (wantname)); \ - return -1; \ - } \ - } while (0) - - CHECK(0, "passthrough"); - -#undef CHECK - - return 0; -} - - struct qemuMonitorJSONTestAttachChardevData { virDomainChrSourceDef *chr; const char *expectPty; @@ -2998,7 +2952,6 @@ mymain(void) DO_TEST(GetVersion); DO_TEST(GetMachines); DO_TEST(GetCPUDefinitions); - DO_TEST(GetTPMModels); if (qemuMonitorJSONTestAttachChardev(driver.xmlopt, qapiData.schema) < 0) ret = -1; DO_TEST(DetachChardev); -- 2.51.0