Re: [libvirt] [PATCH 15/22] cpu: Rename cpuBaseline as virCPUBaseline

[Ján Tomko]

On Wed, May 16, 2018 at 10:39:34AM +0200, Jiri Denemark wrote:

Signed-off-by: Jiri Denemark 
---
src/bhyve/bhyve_driver.c |  4 ++--
src/cpu/cpu.c| 10 +-
src/cpu/cpu.h| 18 +-
src/cpu/cpu_arm.c| 10 +-
src/cpu/cpu_ppc64.c  |  4 ++--
src/cpu/cpu_x86.c| 10 +-
src/libvirt_private.syms |  2 +-
src/libxl/libxl_driver.c |  4 ++--
src/qemu/qemu_driver.c   |  4 ++--
src/test/test_driver.c   |  2 +-
src/vz/vz_driver.c   |  2 +-
tests/cputest.c  |  6 +++---
12 files changed, 38 insertions(+), 38 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 15/22] cpu: Rename cpuBaseline as virCPUBaseline

[Jiri Denemark]

Signed-off-by: Jiri Denemark 
---
 src/bhyve/bhyve_driver.c |  4 ++--
 src/cpu/cpu.c| 10 +-
 src/cpu/cpu.h| 18 +-
 src/cpu/cpu_arm.c| 10 +-
 src/cpu/cpu_ppc64.c  |  4 ++--
 src/cpu/cpu_x86.c| 10 +-
 src/libvirt_private.syms |  2 +-
 src/libxl/libxl_driver.c |  4 ++--
 src/qemu/qemu_driver.c   |  4 ++--
 src/test/test_driver.c   |  2 +-
 src/vz/vz_driver.c   |  2 +-
 tests/cputest.c  |  6 +++---
 12 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index d2a538337f..72c51434c7 100644
--- 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 047e3b1112..81b93a991b 100644
--- 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 83d5bcb63f..529068a618 100644
--- 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;
 virCPUArchUpdateupdate;
 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 44cb4fea68..a9aa065f9f 100644
--- 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 76582d4083..c213245fc9 100644
--- 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   =