mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-11 15:27:47 +00:00
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>
This commit is contained in:
parent
cbf8ebaad4
commit
f62cb55666
@ -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;
|
||||
|
||||
|
@ -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 */
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user