[PATCH v2 01/11] qemu: rename qemuDomainMachineIsVirt()

[Lubomir Rintel <lkundrak@xxxxx>]

It's ARM specific.

Signed-off-by: Lubomir Rintel <lkundrak@xxxxx>
---
 src/qemu/qemu_capabilities.c | 2 +-
 src/qemu/qemu_domain.c       | 6 +++---
 src/qemu/qemu_domain.h       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 419208ad5c..f335a0149c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5134,7 +5134,7 @@ virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr qemuCaps,
     virDomainCapsFeatureGICPtr gic = &domCaps->gic;
     virGICVersion version;
 
-    if (!qemuDomainMachineIsVirt(domCaps->machine, domCaps->arch))
+    if (!qemuDomainMachineIsARMVirt(domCaps->machine, domCaps->arch))
         return 0;
 
     for (version = VIR_GIC_VERSION_LAST - 1;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2119233907..17177c3547 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9024,13 +9024,13 @@ qemuDomainMachineIsS390CCW(const char *machine)
 bool
 qemuDomainIsVirt(const virDomainDef *def)
 {
-    return qemuDomainMachineIsVirt(def->os.machine, def->os.arch);
+    return qemuDomainMachineIsARMVirt(def->os.machine, def->os.arch);
 }
 
 
 bool
-qemuDomainMachineIsVirt(const char *machine,
-                        const virArch arch)
+qemuDomainMachineIsARMVirt(const char *machine,
+                           const virArch arch)
 {
     if (arch != VIR_ARCH_ARMV7L &&
         arch != VIR_ARCH_AARCH64)
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index fd8d9b5305..c016d543a2 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -779,8 +779,8 @@ bool qemuDomainMachineIsQ35(const char *machine);
 bool qemuDomainMachineIsI440FX(const char *machine);
 bool qemuDomainMachineNeedsFDC(const char *machine);
 bool qemuDomainMachineIsS390CCW(const char *machine);
-bool qemuDomainMachineIsVirt(const char *machine,
-                             const virArch arch);
+bool qemuDomainMachineIsARMVirt(const char *machine,
+                                const virArch arch);
 bool qemuDomainMachineIsPSeries(const char *machine,
                                 const virArch arch);
 bool qemuDomainMachineHasBuiltinIDE(const char *machine);
-- 
2.17.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list