From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 12 May 2017 09:03:19 +0000 (+0200)
Subject: qemu: Use qemuDomainMachineIsVirt() more
X-Git-Tag: v3.4.0-rc1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5290d4fdaf7758a03b06d60d113993babee0a9d5;p=thirdparty%2Flibvirt.git

qemu: Use qemuDomainMachineIsVirt() more

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ad5dc0cc2a..546dfd7594 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5842,12 +5842,7 @@ virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr qemuCaps,
     virDomainCapsFeatureGICPtr gic = &domCaps->gic;
     virGICVersion version;
 
-    if (domCaps->arch != VIR_ARCH_ARMV7L &&
-        domCaps->arch != VIR_ARCH_AARCH64)
-        return 0;
-
-    if (STRNEQ(domCaps->machine, "virt") &&
-        !STRPREFIX(domCaps->machine, "virt-"))
+    if (!qemuDomainMachineIsVirt(domCaps->machine, domCaps->arch))
         return 0;
 
     for (version = VIR_GIC_VERSION_LAST - 1;