a41c76
From cd9f9fa54ff87661a0958027baa0c13fca57d2fc Mon Sep 17 00:00:00 2001
a41c76
Message-Id: <cd9f9fa54ff87661a0958027baa0c13fca57d2fc@dist-git>
a41c76
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
a41c76
Date: Wed, 13 May 2020 15:49:12 +0200
a41c76
Subject: [PATCH] qemu: only stop external devices after the domain
a41c76
MIME-Version: 1.0
a41c76
Content-Type: text/plain; charset=UTF-8
a41c76
Content-Transfer-Encoding: 8bit
a41c76
a41c76
A failure in qemuProcessLaunch would lead to qemuExtDevicesStop
a41c76
being called twice - once in the cleanup section and then again
a41c76
in qemuProcessStop.
a41c76
a41c76
However, the first one is called while the QEMU process is
a41c76
still running, which is too soon for the swtpm process, because
a41c76
the swtmp_ioctl command can lock up:
a41c76
a41c76
https://bugzilla.redhat.com/show_bug.cgi?id=1822523
a41c76
a41c76
Remove the first call and only leave the one in qemuProcessStop,
a41c76
which is called after the QEMU process is killed.
a41c76
a41c76
Signed-off-by: Ján Tomko <jtomko@redhat.com>
a41c76
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
a41c76
Reviewed-by: Erik Skultety <eskultet@redhat.com>
a41c76
(cherry picked from commit 006782a8bc5a27125211946fcb12a40f7d4ed12a)
a41c76
Signed-off-by: Ján Tomko <jtomko@redhat.com>
a41c76
Message-Id: <5a8b7f93e0b74cfb27f4bf780eebc7e756a5dcde.1589377631.git.jtomko@redhat.com>
a41c76
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
a41c76
---
a41c76
 src/qemu/qemu_process.c | 2 --
a41c76
 1 file changed, 2 deletions(-)
a41c76
a41c76
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
a41c76
index dffff04554..95c0315e53 100644
a41c76
--- a/src/qemu/qemu_process.c
a41c76
+++ b/src/qemu/qemu_process.c
a41c76
@@ -6962,8 +6962,6 @@ qemuProcessLaunch(virConnectPtr conn,
a41c76
     ret = 0;
a41c76
 
a41c76
  cleanup:
a41c76
-    if (ret < 0)
a41c76
-        qemuExtDevicesStop(driver, vm);
a41c76
     qemuDomainSecretDestroy(vm);
a41c76
     return ret;
a41c76
 }
a41c76
-- 
a41c76
2.26.2
a41c76