|
 |
43fe83 |
From 68d2b7bb402e826812745b67df96f4715746d1bc Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <68d2b7bb402e826812745b67df96f4715746d1bc.1379597660.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
Date: Wed, 18 Sep 2013 10:37:48 +0200
|
|
|
43fe83 |
Subject: [PATCH] qemu: Avoid dangling job in qemuDomainSetBlockIoTune
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=700443
|
|
|
43fe83 |
|
|
|
43fe83 |
virDomainSetBlockIoTuneEnsureACL was incorrectly called after we already
|
|
|
43fe83 |
started a job. As a result of this, the job was not cleaned up when an
|
|
|
43fe83 |
access driver had forbidden the action.
|
|
|
43fe83 |
|
|
|
43fe83 |
(cherry picked from commit 13e9bad55ad3d4705585bd483765805973d9f2f1)
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/qemu/qemu_driver.c | 6 +++---
|
|
|
43fe83 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
43fe83 |
index 53cb1ec..eb1a2ce 100644
|
|
|
43fe83 |
--- a/src/qemu/qemu_driver.c
|
|
|
43fe83 |
+++ b/src/qemu/qemu_driver.c
|
|
|
43fe83 |
@@ -14945,15 +14945,15 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
43fe83 |
if (!(vm = qemuDomObjFromDomain(dom)))
|
|
|
43fe83 |
return -1;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (virDomainSetBlockIoTuneEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
|
|
|
43fe83 |
priv = vm->privateData;
|
|
|
43fe83 |
cfg = virQEMUDriverGetConfig(driver);
|
|
|
43fe83 |
|
|
|
43fe83 |
- if (virDomainSetBlockIoTuneEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
43fe83 |
- goto cleanup;
|
|
|
43fe83 |
-
|
|
|
43fe83 |
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
|
|
|
43fe83 |
goto endjob;
|
|
|
43fe83 |
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|