]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Small code cleanups in the managedsave functions
authorPeter Krempa <pkrempa@redhat.com>
Tue, 11 Dec 2012 18:30:12 +0000 (19:30 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 12 Dec 2012 13:34:12 +0000 (14:34 +0100)
Save a few lines moving assignments into conditions and fix braces
position.

src/qemu/qemu_driver.c

index 4144e6f4740682d96cbb50b185c7ac8a59efd895..87c5b34258b00b5c5f02d8c0ca3331e624cf9242 100644 (file)
@@ -3224,7 +3224,8 @@ qemuDomainSave(virDomainPtr dom, const char *path)
 }
 
 static char *
-qemuDomainManagedSavePath(virQEMUDriverPtr driver, virDomainObjPtr vm) {
+qemuDomainManagedSavePath(virQEMUDriverPtr driver, virDomainObjPtr vm)
+{
     char *ret;
 
     if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) {
@@ -3262,8 +3263,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags)
         goto cleanup;
     }
 
-    name = qemuDomainManagedSavePath(driver, vm);
-    if (name == NULL)
+    if (!(name = qemuDomainManagedSavePath(driver, vm)))
         goto cleanup;
 
     VIR_INFO("Saving state to %s", name);
@@ -3334,8 +3334,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
     if (!(vm = qemuDomObjFromDomainDriver(dom, &driver)))
         return -1;
 
-    name = qemuDomainManagedSavePath(driver, vm);
-    if (name == NULL)
+    if (!(name = qemuDomainManagedSavePath(driver, vm)))
         goto cleanup;
 
     ret = unlink(name);