mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
qemu: Add tpm-crb QEMU device to the command line
Alter qemuBuildTPMDevStr to format the tpm-crb on the command line and use the enum range checking for valid model. Add a test case for the formation of the tpm-crb QEMU device command line. The qemuxml2argvtest changes cannot use the newer DO_TEST_CAPS_LATEST since building of the command line involves calling qemuBuildTPMBackendStr which attempts to open the path to the device (e.g. /dev/tmp0). Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
9323c4bb88
commit
81cb05b7e8
@ -9387,8 +9387,22 @@ qemuBuildTPMDevStr(const virDomainDef *def,
|
|||||||
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
||||||
const virDomainTPMDef *tpm = def->tpm;
|
const virDomainTPMDef *tpm = def->tpm;
|
||||||
const char *model = virDomainTPMModelTypeToString(tpm->model);
|
const char *model = virDomainTPMModelTypeToString(tpm->model);
|
||||||
|
virQEMUCapsFlags flag;
|
||||||
|
|
||||||
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_TIS)) {
|
switch (tpm->model) {
|
||||||
|
case VIR_DOMAIN_TPM_MODEL_TIS:
|
||||||
|
flag = QEMU_CAPS_DEVICE_TPM_TIS;
|
||||||
|
break;
|
||||||
|
case VIR_DOMAIN_TPM_MODEL_CRB:
|
||||||
|
flag = QEMU_CAPS_DEVICE_TPM_CRB;
|
||||||
|
break;
|
||||||
|
case VIR_DOMAIN_TPM_MODEL_LAST:
|
||||||
|
default:
|
||||||
|
virReportEnumRangeError(virDomainTPMModel, tpm->model);
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!virQEMUCapsGet(qemuCaps, flag)) {
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
_("The QEMU executable %s does not support TPM "
|
_("The QEMU executable %s does not support TPM "
|
||||||
"model %s"),
|
"model %s"),
|
||||||
|
27
tests/qemuxml2argvdata/tpm-passthrough-crb.args
Normal file
27
tests/qemuxml2argvdata/tpm-passthrough-crb.args
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
LC_ALL=C \
|
||||||
|
PATH=/bin \
|
||||||
|
HOME=/home/test \
|
||||||
|
USER=test \
|
||||||
|
LOGNAME=test \
|
||||||
|
QEMU_AUDIO_DRV=none \
|
||||||
|
/usr/bin/qemu-system-x86_64 \
|
||||||
|
-name TPM-VM \
|
||||||
|
-S \
|
||||||
|
-machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
|
||||||
|
-m 2048 \
|
||||||
|
-smp 1,sockets=1,cores=1,threads=1 \
|
||||||
|
-uuid 11d7cd22-da89-3094-6212-079a48a309a1 \
|
||||||
|
-display none \
|
||||||
|
-no-user-config \
|
||||||
|
-nodefaults \
|
||||||
|
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-TPM-VM/monitor.sock,\
|
||||||
|
server,nowait \
|
||||||
|
-mon chardev=charmonitor,id=monitor,mode=control \
|
||||||
|
-rtc base=utc \
|
||||||
|
-no-shutdown \
|
||||||
|
-boot order=c,menu=on \
|
||||||
|
-usb \
|
||||||
|
-tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\
|
||||||
|
cancel-path=/sys/class/misc/tpm0/device/cancel \
|
||||||
|
-device tpm-crb,tpmdev=tpm-tpm0,id=tpm0 \
|
||||||
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
@ -2001,6 +2001,8 @@ mymain(void)
|
|||||||
|
|
||||||
DO_TEST("tpm-passthrough",
|
DO_TEST("tpm-passthrough",
|
||||||
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
||||||
|
DO_TEST("tpm-passthrough-crb",
|
||||||
|
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB);
|
||||||
DO_TEST_PARSE_ERROR("tpm-no-backend-invalid",
|
DO_TEST_PARSE_ERROR("tpm-no-backend-invalid",
|
||||||
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user