External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 10:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert checking for QMP query-tpm-models

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

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2013-04-16 07:05:21 -04:00 committed by Stefan Berger
parent cbf8ebaad4
commit f62cb55666
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_capabilities.c
View File

@ -220,8 +220,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"machine-usb-opt", "machine-usb-opt",
"tpm-passthrough", "tpm-passthrough",
"tpm-tis", "tpm-tis",
"query-tpm-models", /* 140 */
); );
struct _virQEMUCaps { struct _virQEMUCaps {
@ -1964,8 +1962,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD); virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD);
else if (STREQ(name, "nbd-server-start")) else if (STREQ(name, "nbd-server-start"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER);
else if (STREQ(name, "query-tpm-models"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_TPM_MODELS);
VIR_FREE(name); VIR_FREE(name);
} }
VIR_FREE(commands); VIR_FREE(commands);
@ -2149,9 +2145,6 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps,
int nentries, i; int nentries, i;
char **entries = NULL; char **entries = NULL;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_TPM_MODELS))
return 0;
if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0) if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0)
return -1; return -1;

1
src/qemu/qemu_capabilities.h
View File

@ -179,7 +179,6 @@ enum virQEMUCapsFlags {
QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */
QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ 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 */ QEMU_CAPS_LAST, /* this must always be the last item */
}; };