48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From 7dd15a340179598dece5546c9e4fec9b8e47aca7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 12:59:07 +0200
|
||
|
|
Subject: [PATCH] qemu: only stop external devices after the domain
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
A failure in qemuProcessLaunch would lead to qemuExtDevicesStop
|
||
|
|
being called twice - once in the cleanup section and then again
|
||
|
|
in qemuProcessStop.
|
||
|
|
|
||
|
|
However, the first one is called while the QEMU process is
|
||
|
|
still running, which is too soon for the swtpm process, because
|
||
|
|
the swtmp_ioctl command can lock up:
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1822523
|
||
|
|
|
||
|
|
Remove the first call and only leave the one in qemuProcessStop,
|
||
|
|
which is called after the QEMU process is killed.
|
||
|
|
|
||
|
|
cherry-pick from commit: 006782a8bc5a27125211946fcb12a40f7d4ed12a
|
||
|
|
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
||
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||
|
|
Signed-off-by: Jin Yan <jinyan12@huawei.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_process.c | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
||
|
|
index 6b9f6fb..6fbe0c1 100644
|
||
|
|
--- a/src/qemu/qemu_process.c
|
||
|
|
+++ b/src/qemu/qemu_process.c
|
||
|
|
@@ -6998,8 +6998,6 @@ qemuProcessLaunch(virConnectPtr conn,
|
||
|
|
ret = 0;
|
||
|
|
|
||
|
|
cleanup:
|
||
|
|
- if (ret < 0)
|
||
|
|
- qemuExtDevicesStop(driver, vm);
|
||
|
|
qemuDomainSecretDestroy(vm);
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|