qemu: rename method for getting preferred machine type

The virQEMUCapsGetDefaultMachine() method doesn't get QEMU's default
machine any more, instead it gets the historical default that libvirt
prefers for each arch. Rename it, so that the old name can be used for
getting QEMU's default.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 828f0ee7ca2719f8e77032a370108de5e5310df4..a97023ce82d8ec00442164b9adc3a2e32cdaaa23 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4977,7 +4977,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
             goto cleanup;
         }
     } else {
-        machine = virQEMUCapsGetDefaultMachine(qemuCaps);
+        machine = virQEMUCapsGetPreferredMachine(qemuCaps);
     }
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
@@ -5036,8 +5036,12 @@ virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps,
 }
 
 
+/*
+ * The preferred machine to use if none is listed explicitly
+ * Note that this may differ from QEMU's own default machine
+ */
 const char *
-virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps)
+virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps)
 {
     if (!qemuCaps->nmachineTypes)
         return NULL;

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index fdfbde48fe931c141261d619bb7105e0788f5b9f..da017ff52bf2f98f9aaae30b11a382a413993e15 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -606,7 +606,7 @@ bool virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuCaps,
 bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps,
                                    const char *canonical_machine);
 
-const char *virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps);
+const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps);
 
 int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
                                    const char *binary,

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 06e77fd5861a18df217fd78796e5af0681264526..3b94cad223395f60040a2dc53f94a2de07e998de 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -168,7 +168,7 @@ fillQemuCaps(virDomainCapsPtr domCaps,
 
     if (!domCaps->machine &&
         VIR_STRDUP(domCaps->machine,
-                   virQEMUCapsGetDefaultMachine(qemuCaps)) < 0)
+                   virQEMUCapsGetPreferredMachine(qemuCaps)) < 0)
         goto cleanup;
 
     if (virQEMUCapsFillDomainCaps(caps, domCaps, qemuCaps,