From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Tue, 16 Apr 2013 11:05:21 +0000 (-0400)
Subject: Revert checking for QMP query-tpm-models
X-Git-Tag: v1.0.5-rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f62cb55666c0d0953132ffdcaf7bbfe6691a2796;p=thirdparty%2Flibvirt.git

Revert checking for QMP query-tpm-models

Revert the patch checking for the QMP query-tpm-models
command.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b174672f56..d10c8aaafd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -220,8 +220,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "machine-usb-opt",
               "tpm-passthrough",
               "tpm-tis",
-
-              "query-tpm-models", /* 140 */
     );
 
 struct _virQEMUCaps {
@@ -1964,8 +1962,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD);
         else if (STREQ(name, "nbd-server-start"))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER);
-        else if (STREQ(name, "query-tpm-models"))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_TPM_MODELS);
         VIR_FREE(name);
     }
     VIR_FREE(commands);
@@ -2149,9 +2145,6 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps,
     int nentries, i;
     char **entries = NULL;
 
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_TPM_MODELS))
-        return 0;
-
     if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0)
         return -1;
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7a0f191a66..728add5620 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -179,7 +179,6 @@ enum virQEMUCapsFlags {
     QEMU_CAPS_MACHINE_USB_OPT    = 137, /* -machine xxx,usb=on/off */
     QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */
     QEMU_CAPS_DEVICE_TPM_TIS     = 139, /* -device tpm_tis */
-    QEMU_CAPS_TPM_MODELS         = 140, /* query-tpm-models QMP command */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };