From a02579141ee42a72f23249fa2c842ef297d7852c Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 11 Dec 2012 19:30:12 +0100 Subject: [PATCH] qemu: Small code cleanups in the managedsave functions Save a few lines moving assignments into conditions and fix braces position. --- src/qemu/qemu_driver.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4144e6f474..87c5b34258 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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);