qemu: monitor: Remove query-tpm-modes/query-tpm-types infrastructure

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>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index e1ff8c15ce2376af4320dce8cb3e524f2f5337fe..1f5b4ec21507c17c2afebf59d202e603a3ab4eba 100644 (file)
--- 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 93fa38da717f81c179075d85c5f2ca818831d208..a2ba5882f6560a0d34f1f3bd05afe6976f82d757 100644 (file)
--- 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 029ecae81a9e4f9f8196c2a8c1f18da55f241117..0e5a9d3b4f4c7e808dceed286471f4f7cbed5b52 100644 (file)
--- 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 bd437f7938b946bcd0b99277340ada84e2c3e9f0..f076e637ba8dd1ef14b6c1588e99a33953ab1c94 100644 (file)
--- 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 f9dc4081f70afe11e0798398b87489e8a662d2eb..38779a20d0a93fd5677cb35339ac22a2891653f7 100644 (file)
--- 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;
@@ -2996,7 +2950,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);