From: Pavel Hrdina Date: Thu, 22 Jul 2021 13:15:18 +0000 (+0200) Subject: qemuxml2argvmock: drop virQEMUCapsGetKVMSupportsSecureGuest X-Git-Tag: v7.6.0-rc1~119 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299174c532029ae7077ff49119f97883406c7aa3;p=thirdparty%2Flibvirt.git qemuxml2argvmock: drop virQEMUCapsGetKVMSupportsSecureGuest It is actually not needed because in qemuxml2argvtest we preload domaincapsmock as well. Reported-by: Michal Privoznik Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d7f77eabf7..2265492f1e 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -41,7 +41,6 @@ #include "virutil.h" #include "qemu/qemu_interface.h" #include "qemu/qemu_command.h" -#include "qemu/qemu_capabilities.h" #include #include #include @@ -302,18 +301,3 @@ virIdentityEnsureSystemToken(void) { return g_strdup("3de80bcbf22d4833897f1638e01be9b2"); } - -static bool (*real_virQEMUCapsGetKVMSupportsSecureGuest)(virQEMUCaps *qemuCaps); - -bool -virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) -{ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) - return true; - - if (!real_virQEMUCapsGetKVMSupportsSecureGuest) - VIR_MOCK_REAL_INIT(virQEMUCapsGetKVMSupportsSecureGuest); - - return real_virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps); -}