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