From: Alex Jia <ajia@redhat.com>
Date: Wed, 28 Sep 2011 08:00:49 +0000 (+0800)
Subject: qemu: add return value check
X-Git-Tag: v0.9.7-rc1~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6dd366ad2dfc8478d124c4f04978829fc0093d5;p=thirdparty%2Flibvirt.git

qemu: add return value check

* src/qemu/qemu_migration.c: if 'vmdef' is NULL, the function
  virDomainSaveConfig still dereferences it, it doesn't make
  sense, so should add return value check to make sure 'vmdef'
  is non-NULL before calling virDomainSaveConfig, in addition,
  in order to debug later, also should record error information
  into log.

Signed-off-by: Alex Jia <ajia@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index be6d0e0f41..1122daba94 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2583,7 +2583,7 @@ qemuMigrationFinish(struct qemud_driver *driver,
                 vm->newDef = vmdef = mig->persistent;
             else
                 vmdef = virDomainObjGetPersistentDef(driver->caps, vm);
-            if (virDomainSaveConfig(driver->configDir, vmdef) < 0) {
+            if (!vmdef || 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
@@ -2604,6 +2604,9 @@ qemuMigrationFinish(struct qemud_driver *driver,
                     if (newVM)
                         vm->persistent = 0;
                 }
+                if (!vmdef)
+                    qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                    _("can't get vmdef"));
                 goto endjob;
             }