External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 15:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for QMP query-tpm-models

Browse Source 
Check for QMP query-tpm-models and set a capability flag. Do not use
this QMP command if it is not supported.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2013-04-15 16:46:53 -04:00 committed by Stefan Berger
parent e7d8ab016b
commit 3208c562b4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

@ -220,6 +220,8 @@ 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 {
@ -1962,6 +1964,8 @@ 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);
@ -2144,6 +2148,10 @@ 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,6 +179,7 @@ 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 */
}; };