From 4332c4d34585534a95fbe103c73077a242976b98 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 5 Mar 2019 21:11:19 -0600 Subject: [PATCH] qemu: clean up qemuDomainRemoveInactiveCommon Use VIR_AUTOFREE and saner formatting. No semantic change. Signed-off-by: Eric Blake Reviewed-by: John Ferlan --- src/qemu/qemu_domain.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index df2f4de262..6a7a8e102b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8689,8 +8689,8 @@ static void qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, virDomainObjPtr vm) { - char *snapDir; virQEMUDriverConfigPtr cfg; + VIR_AUTOFREE(char *) snapDir = NULL; cfg = virQEMUDriverGetConfig(driver); @@ -8698,15 +8698,12 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, if (qemuDomainSnapshotDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); - } - else if (virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, - vm->def->name) < 0) { + } else if (virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, + vm->def->name) < 0) { VIR_WARN("unable to remove snapshot directory %s/%s", cfg->snapshotDir, vm->def->name); - } else { - if (rmdir(snapDir) < 0 && errno != ENOENT) - VIR_WARN("unable to remove snapshot directory %s", snapDir); - VIR_FREE(snapDir); + } else if (rmdir(snapDir) < 0 && errno != ENOENT) { + VIR_WARN("unable to remove snapshot directory %s", snapDir); } qemuExtDevicesCleanupHost(driver, vm->def); -- GitLab