Re: [libvirt] [PATCH] qemu: fix migration flags undefinesource cannot work

On Tue, Oct 27, 2015 at 04:53:59PM +0800, Luyao Huang wrote: > In commit f41be296, we moved vm->persistent check into > qemuDomainRemoveInactive, but we didn't change the vm->persistent > before call qemuDomainRemoveInactive in some place before and just > call it to remove the inactive vm. > > Signed-off-by: Luyao Huang <lhuang(a)redhat.com&gt; > --- > src/qemu/qemu_migration.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > ACK to all three, pushed now.

> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c > index b53491a..2abf2ee 100644 > --- a/src/qemu/qemu_migration.c > +++ b/src/qemu/qemu_migration.c > @@ -3912,8 +3912,10 @@ qemuMigrationConfirm(virConnectPtr conn, > > qemuMigrationJobFinish(driver, vm); > if (!virDomainObjIsActive(vm)) { > - if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) > + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { > virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, > vm); > + vm->persistent = 0; > + } > qemuDomainRemoveInactive(driver, vm); > } > > @@ -5405,8 +5407,10 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, > > qemuMigrationJobFinish(driver, vm); > if (!virDomainObjIsActive(vm) && ret == 0) { > - if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) > + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { > virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, > vm); > + vm->persistent = 0; > + } > qemuDomainRemoveInactive(driver, vm); > } > > -- > 1.8.3.1 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list