From: John Ferlan <jferlan@redhat.com>
Date: Fri, 19 Sep 2014 09:53:04 +0000 (-0400)
Subject: qemu: Add missing goto on rawio
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8921d48868652e7dbb67aa7c77035ac2d5ccb5a3;p=libvirt.git

qemu: Add missing goto on rawio

Commit id '9a2f36ec' added a build conditional of CAP_SYS_RAWIO
in order to determine whether or not a disk definition using rawio
should be allowed on platforms without CAP_SYS_RAWIO. If one was
found, virReportError was used but the code didn't goto cleanup.

This patch adds the goto.
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 245a93ce24..eecef12623 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4357,13 +4357,15 @@ int qemuProcessStart(virConnectPtr conn,
         virDomainDeviceDef dev;
         virDomainDiskDefPtr disk = vm->def->disks[i];
 
-        if (vm->def->disks[i]->rawio == 1)
+        if (vm->def->disks[i]->rawio == 1) {
 #ifdef CAP_SYS_RAWIO
             virCommandAllowCap(cmd, CAP_SYS_RAWIO);
 #else
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Raw I/O is not supported on this platform"));
+            goto cleanup;
 #endif
+        }
 
         dev.type = VIR_DOMAIN_DEVICE_DISK;
         dev.data.disk = disk;