From 112ed8f50d3c19cf9a077a799fa5477da9639429 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 3 Nov 2009 16:24:46 +0100 Subject: [PATCH] Fix compilation problems introduced on commit 9231aa7d9563745c64e4f69afabca65d28bfae25 * src/qemu/qemu_driver.c: in qemudRemoveDomainStatus fix a reference to an undefined variable buf and free up an allocated string --- src/qemu/qemu_driver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 615c1f7a3c..2b8b5502f2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -274,16 +274,19 @@ qemudRemoveDomainStatus(virConnectPtr conn, if (virAsprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) < 0) { virReportOOMError(conn); - goto cleanup; + return(-1); } if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN(_("Failed to remove domain XML for %s: %s"), - vm->def->name, virStrerror(errno, buf, sizeof(ebuf))); + vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); + VIR_FREE(file); + if (virFileDeletePid(driver->stateDir, vm->def->name) != 0) VIR_WARN(_("Failed to remove PID file for %s: %s"), vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); + return 0; } -- GitLab