From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 17 May 2010 15:24:16 +0000 (-0400)
Subject: qemu: Properly cleanup in security startup error path
X-Git-Tag: v0.8.2~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6992818c612fc1bb8666b85056bb8b3d50aaafa;p=thirdparty%2Flibvirt.git

qemu: Properly cleanup in security startup error path

Everything after hostdev setup needs to jump to cleanup on error.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9612f36274..d5816a4829 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3291,7 +3291,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
     if (driver->securityDriver &&
         driver->securityDriver->domainGenSecurityLabel &&
         driver->securityDriver->domainGenSecurityLabel(vm) < 0)
-        return -1;
+        goto cleanup;
 
     DEBUG0("Generating setting domain security labels (if required)");
     if (driver->securityDriver &&