2020-09-22 18:01:38 +08:00
|
|
|
From 9494102bc1560c1870c8ba603e936fa81beaa28c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
|
|
Date: Thu, 23 Apr 2020 10:30:13 +0200
|
|
|
|
|
Subject: [PATCH 8/8] qemuDomainGetUnplugTimeout: Add G_GNUC_NO_INLINE
|
|
|
|
|
|
|
|
|
|
The function is mocked in qemuhotplugmock.so. Recent clang versions
|
|
|
|
|
decided to inline it so the mock stopped working resulting in
|
|
|
|
|
qemuhotplugtest wasting 15 seconds waiting for timeouts.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
2020-09-22 23:06:28 +08:00
|
|
|
(cherry-picked from commit 2ab8dba5)
|
2020-09-22 18:01:38 +08:00
|
|
|
Signed-off-by: AlexChen <alex.chen@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
src/qemu/qemu_hotplug.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
|
|
index 14654a17d7..60d0729f1e 100644
|
|
|
|
|
--- a/src/qemu/qemu_hotplug.c
|
|
|
|
|
+++ b/src/qemu/qemu_hotplug.c
|
|
|
|
|
@@ -5122,7 +5122,7 @@ qemuDomainResetDeviceRemoval(virDomainObjPtr vm)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-unsigned long long
|
|
|
|
|
+unsigned long long G_GNUC_NO_INLINE
|
|
|
|
|
qemuDomainGetUnplugTimeout(virDomainObjPtr vm)
|
|
|
|
|
{
|
|
|
|
|
if (qemuDomainIsPSeries(vm->def))
|
|
|
|
|
--
|
|
|
|
|
2.23.0
|
|
|
|
|
|
