811898dff8
cherry-pick patchs list: 2ab8dba5 qemuDomainGetUnplugTimeout: Add G_GNUC_NO_INLINE 423664a6 virNetDevSwitchdevFeature: Make failure to get 'family_id' non-fatal ca616274 virNetDevGetFamilyId: Change signature 67b973b5 qemuDomainDefPostParse: Fail if unable to fill machine type 67e19fc9 qemu: Revoke access to mirror on failed blockcopy 93b15ba0 qemu: fix hang in p2p + xbzrle compression + parallel migration a13ac587 util: fix iteration in virSocketAddrResolveService 88011ed2 libxl: fix crash when initializing driver Signed-off-by: AlexChen <alex.chen@huawei.com>
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
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>
|
|
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
|
|
|