External/libvirt
1
0
Fork 0
Code

qemu: Move setting of TPM default to post parse function

Browse Source 
Move setting the TPM default version out of the validation function into
the post parse function.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Stefan Berger 2020-07-09 16:46:18 -04:00 committed by Peter Krempa
parent fcac6490f2
commit 5ab5239d89
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_domain.c
View File

@ -4111,12 +4111,13 @@ qemuDomainDefTPMsPostParse(virDomainDefPtr def)
virDomainTPMDefPtr regularTPM = NULL; virDomainTPMDefPtr regularTPM = NULL;
size_t i; size_t i;
if (def->ntpms < 2)
return 0;
for (i = 0; i < def->ntpms; i++) { for (i = 0; i < def->ntpms; i++) {
virDomainTPMDefPtr tpm = def->tpms[i]; virDomainTPMDefPtr tpm = def->tpms[i];
/* TPM 1.2 and 2 are not compatible, so we choose a specific version here */
if (tpm->version == VIR_DOMAIN_TPM_VERSION_DEFAULT)
tpm->version = VIR_DOMAIN_TPM_VERSION_1_2;
if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY) { if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY) {
if (proxyTPM) { if (proxyTPM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

4
src/qemu/qemu_validate.c
View File

@ -3644,10 +3644,6 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm,
{ {
virQEMUCapsFlags flag; virQEMUCapsFlags flag;
/* TPM 1.2 and 2 are not compatible, so we choose a specific version here */
if (tpm->version == VIR_DOMAIN_TPM_VERSION_DEFAULT)
tpm->version = VIR_DOMAIN_TPM_VERSION_1_2;
switch (tpm->version) { switch (tpm->version) {
case VIR_DOMAIN_TPM_VERSION_1_2: case VIR_DOMAIN_TPM_VERSION_1_2:
/* TPM 1.2 + CRB do not work */ /* TPM 1.2 + CRB do not work */