qemu: Rename virQEMUCaps{Get,Fetch}CPUDefinitions

The functions return virDomainCapsCPUModelsPtr and thus they should be
called *CPUModels for consistency. Functions called *CPUDefinitions will
work on qemuMonitorCPUDefsPtr.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index fac10427a256e68f1dad493afb621183d689c5e6..9e7c42e66697bb688b717e8486bb54e6dc54b300 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1911,10 +1911,10 @@ virQEMUCapsCPUDefsToModels(qemuMonitorCPUDefsPtr defs,
 
 
 virDomainCapsCPUModelsPtr
-virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
-                             virDomainVirtType type,
-                             const char **modelWhitelist,
-                             const char **modelBlacklist)
+virQEMUCapsGetCPUModels(virQEMUCapsPtr qemuCaps,
+                        virDomainVirtType type,
+                        const char **modelWhitelist,
+                        const char **modelBlacklist)
 {
     virDomainCapsCPUModelsPtr cpuModels;
 
@@ -2471,9 +2471,9 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps,
 
 
 int
-virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
-                               virArch arch,
-                               virDomainCapsCPUModelsPtr *cpuModels)
+virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
+                          virArch arch,
+                          virDomainCapsCPUModelsPtr *cpuModels)
 {
     g_autoptr(qemuMonitorCPUDefs) defs = NULL;
     size_t i;
@@ -2523,7 +2523,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
         return 0;
 
-    if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &models) < 0)
+    if (virQEMUCapsFetchCPUModels(mon, qemuCaps->arch, &models) < 0)
         return -1;
 
     if (tcg || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
@@ -3148,7 +3148,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
     if (!(data = virQEMUCapsGetCPUModelX86Data(qemuCaps, model, migratable)))
         goto cleanup;
 
-    cpuModels = virQEMUCapsGetCPUDefinitions(qemuCaps, type, NULL, NULL);
+    cpuModels = virQEMUCapsGetCPUModels(qemuCaps, type, NULL, NULL);
 
     if (cpuDecode(cpu, data, cpuModels) < 0)
         goto cleanup;
@@ -3237,7 +3237,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
 
         VIR_DEBUG("No host CPU model info from QEMU; probing host CPU directly");
 
-        cpuModels = virQEMUCapsGetCPUDefinitions(qemuCaps, type, NULL, NULL);
+        cpuModels = virQEMUCapsGetCPUModels(qemuCaps, type, NULL, NULL);
         hostCPU = virQEMUCapsProbeHostCPU(hostArch, cpuModels);
 
         if (!hostCPU ||
@@ -5282,10 +5282,10 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
         VIR_AUTOSTRINGLIST models = NULL;
 
         if (virCPUGetModels(domCaps->arch, &models) >= 0) {
-            domCaps->cpu.custom = virQEMUCapsGetCPUDefinitions(qemuCaps,
-                                                               domCaps->virttype,
-                                                               (const char **)models,
-                                                               blacklist);
+            domCaps->cpu.custom = virQEMUCapsGetCPUModels(qemuCaps,
+                                                          domCaps->virttype,
+                                                          (const char **)models,
+                                                          blacklist);
         } else {
             domCaps->cpu.custom = NULL;
         }

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0de5179e86f63aef0d98eca89936841a3e2ea300..2e23376ea460ec7d1220829e2f95b74dae8bcedb 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -572,13 +572,13 @@ int virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
                                  const char **name,
                                  size_t count,
                                  virDomainCapsCPUUsable usable);
-virDomainCapsCPUModelsPtr virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
-                                                       virDomainVirtType type,
-                                                       const char **modelWhitelist,
-                                                       const char **modelBlacklist);
-int virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
-                                   virArch arch,
-                                   virDomainCapsCPUModelsPtr *cpuModels);
+virDomainCapsCPUModelsPtr virQEMUCapsGetCPUModels(virQEMUCapsPtr qemuCaps,
+                                                  virDomainVirtType type,
+                                                  const char **modelWhitelist,
+                                                  const char **modelBlacklist);
+int virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
+                              virArch arch,
+                              virDomainCapsCPUModelsPtr *cpuModels);
 
 typedef enum {
     /* Host CPU definition reported in domain capabilities. */

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0a748b10a2dda49a81cb0adc26b92ab424fc999e..669c12d6ca716bcf9b1dde4b31166bc3f2a6b9af 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13710,7 +13710,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn,
     if (!qemuCaps)
         goto cleanup;
 
-    if (!(cpuModels = virQEMUCapsGetCPUDefinitions(qemuCaps, virttype, NULL, NULL)) ||
+    if (!(cpuModels = virQEMUCapsGetCPUModels(qemuCaps, virttype, NULL, NULL)) ||
         cpuModels->nmodels == 0) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("QEMU '%s' does not support any CPU models for "

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 30d62d1756f3ed0bafaf5d0628058eaf89d63710..7ae0492a6bc796c0ca3eeb30bcc152e48f91f0a4 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4341,7 +4341,7 @@ qemuProcessFetchCPUDefinitions(virQEMUDriverPtr driver,
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
         goto error;
 
-    rc = virQEMUCapsFetchCPUDefinitions(priv->mon, vm->def->os.arch, &models);
+    rc = virQEMUCapsFetchCPUModels(priv->mon, vm->def->os.arch, &models);
 
     if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
         goto error;
@@ -6057,7 +6057,7 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
                                                  VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0)
             return -1;
 
-        cpuModels = virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType, NULL, NULL);
+        cpuModels = virQEMUCapsGetCPUModels(qemuCaps, def->virtType, NULL, NULL);
 
         if (virCPUTranslate(def->os.arch, def->cpu, cpuModels) < 0)
             return -1;

diff --git a/tests/cputest.c b/tests/cputest.c
index 21d95e9e289d3d2f7ffc63571f58f4783dc381d8..3af4bb93967b51b8d6625b2811be752fc94e5b91 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -542,7 +542,7 @@ cpuTestGetCPUModels(const struct data *data,
     if (!(qemuCaps = cpuTestMakeQEMUCaps(data)))
         return -1;
 
-    *models = virQEMUCapsGetCPUDefinitions(qemuCaps, VIR_DOMAIN_VIRT_KVM, NULL, NULL);
+    *models = virQEMUCapsGetCPUModels(qemuCaps, VIR_DOMAIN_VIRT_KVM, NULL, NULL);
 
     virObjectUnref(qemuCaps);