From: Luyao Huang <lhuang@redhat.com>
Date: Mon, 4 May 2015 09:36:16 +0000 (+0800)
Subject: qemu: fix the vm deadlock when deleting a nonexistent iothread
X-Git-Tag: v1.2.16-rc1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f7cad7a8fb5f646a924975517ff3f04c723540b;p=thirdparty%2Flibvirt.git

qemu: fix the vm deadlock when deleting a nonexistent iothread

https://bugzilla.redhat.com/show_bug.cgi?id=1218145

Jump to endjob instead of cleanup to fix this deadlock.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f8d493d47f..a76858a15c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6365,7 +6365,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
                                _("cannot find IOThread '%u' in persistent "
                                  "iothreadids"),
                                iothread_id);
-                goto cleanup;
+                goto endjob;
             }
 
             virDomainIOThreadIDDel(persistentDef, iothread_id);