From 78c25600daf2a2822e7ecec2af9e7458b9f44eff Mon Sep 17 00:00:00 2001 From: yezengruan Date: Sat, 12 Mar 2022 09:35:07 +0800 Subject: [PATCH 1/6] Revert libvirt: support aarch64 vtpm with parameter tpm-tis-device Before backport the patch support aarch64 vtpm, let's revert it first. Signed-off-by: yezengruan --- src/conf/domain_conf.c | 1 - src/conf/domain_conf.h | 1 - src/qemu/qemu_capabilities.c | 9 +-------- src/qemu/qemu_capabilities.h | 4 +--- src/qemu/qemu_domain.c | 3 --- 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4e3bcf479c..54228a2151 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1141,7 +1141,6 @@ VIR_ENUM_IMPL(virDomainTPMModel, "tpm-tis", "tpm-crb", "tpm-spapr", - "tpm-tis-device", ); VIR_ENUM_IMPL(virDomainTPMBackend, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ccee986849..e057c384c6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1280,7 +1280,6 @@ typedef enum { VIR_DOMAIN_TPM_MODEL_TIS, VIR_DOMAIN_TPM_MODEL_CRB, VIR_DOMAIN_TPM_MODEL_SPAPR, - VIR_DOMAIN_TPM_MODEL_TIS_DEVICE, VIR_DOMAIN_TPM_MODEL_LAST } virDomainTPMModel; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6013be9d05..0fb3e74c77 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -568,9 +568,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "blockdev-snapshot.allow-write-only-overlay", "blockdev-reopen", "storage.werror", - - /* 360 */ - "tpm-tis-device", + "migration-param.bandwidth", "migration-param.downtime", "migration-param.xbzrle-cache-size", @@ -1292,7 +1290,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN }, { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR }, { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS }, - { "tpm-tis-device", QEMU_CAPS_DEVICE_TPM_TIS_DEVICE }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { @@ -3100,10 +3097,6 @@ const struct tpmTypeToCaps virQEMUCapsTPMModelsToCaps[] = { .type = VIR_DOMAIN_TPM_MODEL_SPAPR, .caps = QEMU_CAPS_DEVICE_TPM_SPAPR, }, - { - .type = VIR_DOMAIN_TPM_MODEL_TIS_DEVICE, - .caps = QEMU_CAPS_DEVICE_TPM_TIS_DEVICE, - }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5f28006b48..10a6ce50e7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -549,9 +549,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */ QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */ QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */ - - /* 360 */ - QEMU_CAPS_DEVICE_TPM_TIS_DEVICE, /* -device tpm-tis-device */ + QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */ QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */ QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2351cac120..cb2fbdc179 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8130,9 +8130,6 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm, case VIR_DOMAIN_TPM_MODEL_SPAPR: flag = QEMU_CAPS_DEVICE_TPM_SPAPR; break; - case VIR_DOMAIN_TPM_MODEL_TIS_DEVICE: - flag = QEMU_CAPS_DEVICE_TPM_TIS_DEVICE; - break; case VIR_DOMAIN_TPM_MODEL_LAST: default: virReportEnumRangeError(virDomainTPMModel, tpm->model); -- 2.27.0