From 2480d7857c6ea384567009840040b900f5440616 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Tue, 9 Feb 2021 14:57:22 -0700 Subject: [PATCH 2/6] qemu: Fix swtpm device with aarch64 Starting a VM with swtpm device fails with qemu-system-aarch64. E.g. with TPM device config QEMU reports the following error error: internal error: process exited while connecting to monitor: 2021-02-07T05:15:35.378927Z qemu-system-aarch64: -device tpm-tis,tpmdev=tpm-tpm0,id=tpm0: 'tpm-tis' is not a valid device model name Indeed the TPM device name is 'tpm-tis-device' [1][2] for aarch64, versus the shorter 'tpm-tis' for x86. The devices are the same from a functional POV, i.e. they both emulate a TPM device conforming to the TIS specification. Account for the unfortunate name difference when building the TPM device option in qemuBuildTPMDevStr(). Also include a test case for 'tpm-tis-device'. [1] https://qemu.readthedocs.io/en/latest/specs/tpm.html [2] https://github.com/qemu/qemu/commit/c294ac327ca99342b90bd3a83d2cef9b447afaa7 Signed-off-by: Jim Fehlig Reviewed-by: Andrea Bolognani Signed-off-by: yezengruan --- src/qemu/qemu_command.c | 3 ++ .../caps_5.0.0.aarch64.replies | 15 ++++++++ .../caps_5.0.0.aarch64.xml | 3 ++ .../aarch64-tpm.aarch64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvdata/aarch64-tpm.xml | 15 ++++++++ tests/qemuxml2argvtest.c | 1 + 6 files changed, 72 insertions(+) create mode 100644 tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-tpm.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f8331a7455..d5d46c0892 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9232,6 +9232,9 @@ qemuBuildTPMDevStr(const virDomainDef *def, virDomainTPMDef *tpm = def->tpm; const char *model = virDomainTPMModelTypeToString(tpm->model); + if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch == VIR_ARCH_AARCH64) + model = "tpm-tis-device"; + virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s", model, tpm->info.alias, tpm->info.alias); diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies index a3136a0966..e848860e45 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies @@ -2734,6 +2734,10 @@ "name": "armv7m_systick", "parent": "sys-bus-device" }, + { + "name": "tpm-emulator", + "parent": "tpm-backend" + }, { "name": "imx6ul.ccm", "parent": "imx.ccm" @@ -3198,6 +3202,10 @@ "name": "authz-list", "parent": "authz" }, + { + "name": "tpm-passthrough", + "parent": "tpm-backend" + }, { "name": "xlnx.ps7-spi", "parent": "sys-bus-device" @@ -3286,6 +3294,10 @@ "name": "bcm2835-peripherals", "parent": "sys-bus-device" }, + { + "name": "tpm-tis-device", + "parent": "sys-bus-device" + }, { "name": "arm-its-kvm", "parent": "arm-gicv3-its-common" @@ -7768,6 +7780,7 @@ { "return": [ + "tpm-tis" ], "id": "libvirt-36" } @@ -7779,6 +7792,8 @@ { "return": [ + "passthrough", + "emulator" ], "id": "libvirt-37" } diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 92ad10c9b8..af282f33c1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -42,6 +42,8 @@ + + @@ -150,6 +152,7 @@ + diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args new file mode 100644 index 0000000000..4ca09a1fb0 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-aarch64test \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name guest=aarch64test,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-aarch64test/master-key.aes \ +-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \ +-cpu cortex-a15 \ +-m 1024 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-tpmdev emulator,id=tpm-tpm0,chardev=chrtpm \ +-chardev socket,id=chrtpm,path=/dev/test \ +-device tpm-tis-device,tpmdev=tpm-tpm0,id=tpm0 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/aarch64-tpm.xml b/tests/qemuxml2argvdata/aarch64-tpm.xml new file mode 100644 index 0000000000..d338a20f17 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-tpm.xml @@ -0,0 +1,15 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + + + /usr/bin/qemu-system-aarch64 + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dc871d5698..47fce1c3bf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2305,6 +2305,7 @@ mymain(void) DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64"); DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE); DO_TEST_PARSE_ERROR("pci-bus-invalid", NONE); -- 2.27.0