From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Fri, 26 Aug 2011 03:08:11 +0000 (+0900)
Subject: Fix persistent migration config save
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=709b4c500dd3b7f5ffd48f8e13e2eb5fbf1d0701;p=libvirt.git

Fix persistent migration config save

When a user migrates a domain by command as

libvirt saves vm's domain XML config in destination host after migration.
But it saves vm->def. Then, the saved XML contains some garbage.

  <domain type='kvm' id='50'>
                     ^^^^^^^^
  ...
   <console type='pty' tty='/dev/pts/5'>
                       ^^^^^^^^^^^^^^^^^

Avoid saving unnecessary things by saving persistent vm definition.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 3818d71c5f..a2dc97cc37 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2487,11 +2487,12 @@ qemuMigrationFinish(struct qemud_driver *driver,
         qemuMigrationVPAssociatePortProfiles(vm->def);
 
         if (flags & VIR_MIGRATE_PERSIST_DEST) {
+            virDomainDefPtr vmdef;
             if (vm->persistent)
                 newVM = 0;
             vm->persistent = 1;
-
-            if (virDomainSaveConfig(driver->configDir, vm->def) < 0) {
+            vmdef = virDomainObjGetPersistentDef(driver->caps, vm);
+            if (virDomainSaveConfig(driver->configDir, vmdef) < 0) {
                 /* Hmpf.  Migration was successful, but making it persistent
                  * was not.  If we report successful, then when this domain
                  * shuts down, management tools are in for a surprise.  On the