From 21b2025a0e47e000b9f49ab64ddcf0241e9fc8ff Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Wed, 23 Oct 2019 17:51:50 +0200 Subject: [PATCH] qemu: Make virQEMUCapsIsMachineSupported static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/qemu/qemu_capabilities.c | 28 ++++++++++++++-------------- src/qemu/qemu_capabilities.h | 3 --- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0a84de1cb9..53c96b248f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2428,6 +2428,20 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, } +static bool +virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, + const char *canonical_machine) +{ + size_t i; + + for (i = 0; i < qemuCaps->nmachineTypes; i++) { + if (STREQ(canonical_machine, qemuCaps->machineTypes[i].name)) + return true; + } + return false; +} + + static int virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) @@ -5146,20 +5160,6 @@ virQEMUCapsSupportsVmport(virQEMUCapsPtr qemuCaps, } -bool -virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, - const char *canonical_machine) -{ - size_t i; - - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - if (STREQ(canonical_machine, qemuCaps->machineTypes[i].name)) - return true; - } - return false; -} - - /* * The preferred machine to use if none is listed explicitly * Note that this may differ from QEMU's own default machine diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c904587da1..876efaa3b5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -645,9 +645,6 @@ bool virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuCaps, virDomainVirtType virtType, virGICVersion version); -bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, - const char *canonical_machine); - const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps); int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, -- GitLab