From: Peter Krempa Date: Tue, 2 Apr 2019 10:31:31 +0000 (+0200) Subject: qemu: Decide whether check GIC caps in virQEMUCapsProbeQMPGICCapabilities X-Git-Tag: v5.3.0-rc1~347 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c31b9159e6784f5b4968d8db0995073c9a0841e7;p=thirdparty%2Flibvirt.git qemu: Decide whether check GIC caps in virQEMUCapsProbeQMPGICCapabilities Move the check out of virQEMUCapsInitQMPMonitor similarly to other functions. Signed-off-by: Peter Krempa Reviewed-by: Erik Skultety --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0e48022fdb..6ee6a8c648 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2738,6 +2738,11 @@ virQEMUCapsProbeQMPGICCapabilities(virQEMUCapsPtr qemuCaps, virGICCapability *caps = NULL; int ncaps; + if (!(qemuCaps->arch == VIR_ARCH_AARCH64 || + qemuCaps->arch == VIR_ARCH_ARMV6L || + qemuCaps->arch == VIR_ARCH_ARMV7L)) + return 0; + if ((ncaps = qemuMonitorGetGICCapabilities(mon, &caps)) < 0) return -1; @@ -4368,12 +4373,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, goto cleanup; if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, false) < 0) goto cleanup; - - /* GIC capabilities, eg. available GIC versions */ - if ((qemuCaps->arch == VIR_ARCH_AARCH64 || - qemuCaps->arch == VIR_ARCH_ARMV6L || - qemuCaps->arch == VIR_ARCH_ARMV7L) && - virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) + if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) goto cleanup; /* Probe for SEV capabilities */