cpu: Rename cpuBaseline as virCPUBaseline

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

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index d2a538337fcf63e6e1eebb4c695e4f5c6195a591..72c51434c7c8bb19a4829691f5d05ab9e6a9f62d 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1398,8 +1398,8 @@ bhyveConnectBaselineCPU(virConnectPtr conn,
     if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
         goto cleanup;
 
-    if (!(cpu = cpuBaseline(cpus, ncpus, NULL,
-                            !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
+    if (!(cpu = virCPUBaseline(cpus, ncpus, NULL,
+                               !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
         goto cleanup;
 
     if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 047e3b11129622e699c06d8e54e4268bc576fce3..81b93a991bd7a7d08e27b2593768cbf233f0ac4d 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -479,7 +479,7 @@ virCPUProbeHost(virArch arch)
 
 
 /**
- * cpuBaseline:
+ * virCPUBaseline:
  *
  * @cpus: list of host CPU definitions
  * @ncpus: number of CPUs in @cpus
@@ -494,10 +494,10 @@ virCPUProbeHost(virArch arch)
  * Returns baseline CPU definition or NULL on error.
  */
 virCPUDefPtr
-cpuBaseline(virCPUDefPtr *cpus,
-            unsigned int ncpus,
-            virDomainCapsCPUModelsPtr models,
-            bool migratable)
+virCPUBaseline(virCPUDefPtr *cpus,
+               unsigned int ncpus,
+               virDomainCapsCPUModelsPtr models,
+               bool migratable)
 {
     struct cpuArchDriver *driver;
     size_t i;

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 83d5bcb63f9dca78c42b027bdd9027f12145d85d..529068a618397ce5f6d0e52152c7c51ee62ebf38 100644 (file)
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -73,10 +73,10 @@ typedef int
                      virDomainCapsCPUModelsPtr models);
 
 typedef virCPUDefPtr
-(*cpuArchBaseline)  (virCPUDefPtr *cpus,
-                     unsigned int ncpus,
-                     virDomainCapsCPUModelsPtr models,
-                     bool migratable);
+(*virCPUArchBaseline)(virCPUDefPtr *cpus,
+                      unsigned int ncpus,
+                      virDomainCapsCPUModelsPtr models,
+                      bool migratable);
 
 typedef int
 (*virCPUArchUpdate)(virCPUDefPtr guest,
@@ -129,7 +129,7 @@ struct cpuArchDriver {
     cpuArchEncode       encode;
     cpuArchDataFree     dataFree;
     virCPUArchGetHost   getHost;
-    cpuArchBaseline     baseline;
+    virCPUArchBaseline baseline;
     virCPUArchUpdate    update;
     virCPUArchUpdateLive updateLive;
     virCPUArchCheckFeature checkFeature;
@@ -194,10 +194,10 @@ virCPUDefPtr
 virCPUProbeHost(virArch arch);
 
 virCPUDefPtr
-cpuBaseline (virCPUDefPtr *cpus,
-             unsigned int ncpus,
-             virDomainCapsCPUModelsPtr models,
-             bool migratable);
+virCPUBaseline(virCPUDefPtr *cpus,
+               unsigned int ncpus,
+               virDomainCapsCPUModelsPtr models,
+               bool migratable);
 
 int
 virCPUUpdate(virArch arch,

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 44cb4fea6810794d5fdb54a2b7e3e9432b3d3fd2..a9aa065f9f50423b83013196026bf6226cce4f68 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -73,10 +73,10 @@ virCPUarmUpdate(virCPUDefPtr guest,
 
 
 static virCPUDefPtr
-armBaseline(virCPUDefPtr *cpus,
-            unsigned int ncpus ATTRIBUTE_UNUSED,
-            virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
-            bool migratable ATTRIBUTE_UNUSED)
+virCPUarmBaseline(virCPUDefPtr *cpus,
+                  unsigned int ncpus ATTRIBUTE_UNUSED,
+                  virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
+                  bool migratable ATTRIBUTE_UNUSED)
 {
     virCPUDefPtr cpu = NULL;
 
@@ -107,6 +107,6 @@ struct cpuArchDriver cpuDriverArm = {
     .compare = virCPUarmCompare,
     .decode = NULL,
     .encode = NULL,
-    .baseline = armBaseline,
+    .baseline = virCPUarmBaseline,
     .update = virCPUarmUpdate,
 };

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 76582d4083bb23b117a16d7d8e5b04098b8edde4..c213245fc9fa3b4996bf22799e196d16044e5fbb 100644 (file)
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -767,7 +767,7 @@ virCPUppc64Update(virCPUDefPtr guest,
 }
 
 static virCPUDefPtr
-ppc64DriverBaseline(virCPUDefPtr *cpus,
+virCPUppc64Baseline(virCPUDefPtr *cpus,
                     unsigned int ncpus,
                     virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
                     bool migratable ATTRIBUTE_UNUSED)
@@ -901,7 +901,7 @@ struct cpuArchDriver cpuDriverPPC64 = {
     .encode     = NULL,
     .dataFree   = virCPUppc64DataFree,
     .getHost    = virCPUppc64GetHost,
-    .baseline   = ppc64DriverBaseline,
+    .baseline   = virCPUppc64Baseline,
     .update     = virCPUppc64Update,
     .getModels  = virCPUppc64DriverGetModels,
     .convertLegacy = virCPUppc64ConvertLegacy,

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index b2398c5ad2108649b113fe1bcac091d54d374cbc..188d1eba75b8bc12afd3131e1f88a89dfc236eb6 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2464,10 +2464,10 @@ virCPUx86GetHost(virCPUDefPtr cpu,
 
 
 static virCPUDefPtr
-x86Baseline(virCPUDefPtr *cpus,
-            unsigned int ncpus,
-            virDomainCapsCPUModelsPtr models,
-            bool migratable)
+virCPUx86Baseline(virCPUDefPtr *cpus,
+                  unsigned int ncpus,
+                  virDomainCapsCPUModelsPtr models,
+                  bool migratable)
 {
     virCPUx86MapPtr map = NULL;
     virCPUx86ModelPtr base_model = NULL;
@@ -3050,7 +3050,7 @@ struct cpuArchDriver cpuDriverX86 = {
 #if defined(__i386__) || defined(__x86_64__)
     .getHost    = virCPUx86GetHost,
 #endif
-    .baseline   = x86Baseline,
+    .baseline   = virCPUx86Baseline,
     .update     = virCPUx86Update,
     .updateLive = virCPUx86UpdateLive,
     .checkFeature = virCPUx86CheckFeature,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index a97b7fe223d34a3e3eb8b5bf5ace9e2f8eb9edb8..8d381ee11b5cca4a89fd1590fa8939edc2b06aa7 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1140,9 +1140,9 @@ virStoragePoolObjVolumeListExport;
 
 
 # cpu/cpu.h
-cpuBaseline;
 cpuDecode;
 cpuEncode;
+virCPUBaseline;
 virCPUCheckFeature;
 virCPUCompare;
 virCPUCompareXML;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index df53dead0a22f75f9d02e42868cb1bf2018c81d4..e11969dca7176813960c9820ed7d15297aac0423 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -6349,8 +6349,8 @@ libxlConnectBaselineCPU(virConnectPtr conn,
     if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
         goto cleanup;
 
-    if (!(cpu = cpuBaseline(cpus, ncpus, NULL,
-                            !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
+    if (!(cpu = virCPUBaseline(cpus, ncpus, NULL,
+                               !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
         goto cleanup;
 
     if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e9abffdc81b2ecb2282705913203f68181b4bb57..08139553a1920f10e540e9e32801ed61721dd66f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13315,8 +13315,8 @@ qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
     if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
         goto cleanup;
 
-    if (!(baseline = cpuBaseline(cpus, ncpus, NULL,
-                                 !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
+    if (!(baseline = virCPUBaseline(cpus, ncpus, NULL,
+                                    !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
         goto cleanup;
 
     if (!(cpu = virCPUDefCopyWithoutModel(baseline)))

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2644b26b02546015f64eb61838682d666524ab2f..0d591d5f9952b0b7cd51bacc2e01ada91e40ac78 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1541,7 +1541,7 @@ testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
     if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
         goto cleanup;
 
-    if (!(cpu = cpuBaseline(cpus, ncpus, NULL, false)))
+    if (!(cpu = virCPUBaseline(cpus, ncpus, NULL, false)))
         goto cleanup;
 
     if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 48a9a866d9b81f8c2f5d25ade32abd399bdc4c7d..d4cf2d5f62255a6100e51ae03b70327583e6855f 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -934,7 +934,7 @@ vzConnectBaselineCPU(virConnectPtr conn,
     if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
         goto cleanup;
 
-    if (!(cpu = cpuBaseline(cpus, ncpus, NULL, false)))
+    if (!(cpu = virCPUBaseline(cpus, ncpus, NULL, false)))
         goto cleanup;
 
     if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

diff --git a/tests/cputest.c b/tests/cputest.c
index e86cd0b9bc5f7f46448975f601ae54ec5f1e88b9..beb9afabdfa59b082ef1cf183fce2de2d53c5fc4 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -321,8 +321,8 @@ cpuTestBaseline(const void *arg)
     if (!(cpus = cpuTestLoadMultiXML(data->arch, data->name, &ncpus)))
         goto cleanup;
 
-    baseline = cpuBaseline(cpus, ncpus, NULL,
-                           !!(data->flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE));
+    baseline = virCPUBaseline(cpus, ncpus, NULL,
+                              !!(data->flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE));
 
     if (baseline &&
         (data->flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&
@@ -337,7 +337,7 @@ cpuTestBaseline(const void *arg)
             ret = 0;
         } else {
             VIR_TEST_VERBOSE("\n%-70s... ",
-                    "cpuBaseline was expected to fail but it succeeded");
+                    "virCPUBaseline was expected to fail but it succeeded");
         }
         goto cleanup;
     }