External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Reject TPM 1.2 for ARM virt guests

Browse Source 
We already reject TPM 1.2 in a number of scenarios; let's add
ARM virt guests to the list.

https://bugzilla.redhat.com/show_bug.cgi?id=1970310

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Tested-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2021-06-25 15:33:33 +02:00
parent bf84313bbc
commit d8a1c059e0
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_validate.c
View File

@ -4517,6 +4517,12 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm,
_("TPM 1.2 is not supported with the SPAPR device model"));
return -1;
}
/* TPM 1.2 + ARM does not work */
if (qemuDomainIsARMVirt(def)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("TPM 1.2 is not supported on ARM"));
return -1;
}
break;
case VIR_DOMAIN_TPM_VERSION_2_0:
case VIR_DOMAIN_TPM_VERSION_DEFAULT:

1
tests/qemuxml2argvdata/aarch64-tpm-wrong-model.err Normal file
View File

@ -0,0 +1 @@
unsupported configuration: TPM 1.2 is not supported on ARM

15
tests/qemuxml2argvdata/aarch64-tpm-wrong-model.xml Normal file
View File

@ -0,0 +1,15 @@
<domain type="qemu">
<name>aarch64test</name>
<uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
<memory>1048576</memory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch="aarch64" machine="virt">hvm</type>
</os>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<tpm model='tpm-tis'>
<backend type='emulator' version='1.2'/>
</tpm>
</devices>
</domain>

1
tests/qemuxml2argvtest.c
View File

@ -2565,6 +2565,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate");
DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr");
DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64");
DO_TEST_PARSE_ERROR("aarch64-tpm-wrong-model", "aarch64");
DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE);
DO_TEST_PARSE_ERROR("pci-bus-invalid", NONE);