On 10/4/22 15:38, Stefan Berger wrote: > This patch 'fixes' the behavior of the persistent_state TPM domain XML > attribute that intends to preserve the state of the TPM but should not > keep the state around on all the hosts a VM has been migrated to. It > removes the TPM state directory structure from the source host upon > successful migration when non-shared storage is used. Similarly, it > removes it from the destination host upon migration failure when > non-shared storage is used. > > Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx> > --- > src/qemu/qemu_migration.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c > index 126a4f6d38..3ad8f2cfd7 100644 > --- a/src/qemu/qemu_migration.c > +++ b/src/qemu/qemu_migration.c > @@ -38,6 +38,7 @@ > #include "qemu_security.h" > #include "qemu_slirp.h" > #include "qemu_block.h" > +#include "qemu_tpm.h" This is not needed. > > #include "domain_audit.h" > #include "virlog.h" > @@ -4036,7 +4037,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, > virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); > vm->persistent = 0; > } > - qemuDomainRemoveInactive(driver, vm, 0); > + qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM); > } > > cleanup: > @@ -6702,7 +6703,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, > } > > if (!virDomainObjIsActive(vm)) > - qemuDomainRemoveInactive(driver, vm, 0); > + qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM); > > virErrorRestore(&orig_err); > return NULL; Michal
