From: Jim Meyering <meyering@redhat.com>
Date: Wed, 19 May 2010 15:48:03 +0000 (+0200)
Subject: qemudDomainMigrateFinish2: handle a case of virDomainSaveStatus failure
X-Git-Tag: v0.8.2~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aacf84a3bcb63a410ac46ae5e27cd7f0385f6c7;p=thirdparty%2Flibvirt.git

qemudDomainMigrateFinish2: handle a case of virDomainSaveStatus failure

* src/qemu/qemu_driver.c (qemudDomainMigrateFinish2): Don't ignore
virDomainSaveStatus failure.
* src/conf/domain_conf.h (virDomainSaveStatus): Use
ATTRIBUTE_RETURN_CHECK, so this doesn't happen again.
---

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index fadc8bd4f7..a7206d33ba 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1011,7 +1011,7 @@ int virDomainSaveConfig(const char *configDir,
                         virDomainDefPtr def);
 int virDomainSaveStatus(virCapsPtr caps,
                         const char *statusDir,
-                        virDomainObjPtr obj);
+                        virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK;
 
 typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom,
                                           int newDomain,
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 65ca1175e1..a519c028c8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10816,7 +10816,10 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
                                              VIR_DOMAIN_EVENT_SUSPENDED,
                                              VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
         }
-        virDomainSaveStatus(driver->caps, driver->stateDir, vm);
+        if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) {
+            VIR_WARN("Failed to save status on vm %s", vm->def->name);
+            goto endjob;
+        }
     } else {
         qemudShutdownVMDaemon(driver, vm, 0);
         event = virDomainEventNewFromObj(vm,