4:39 p.m.
The new name is virCPUGetModels.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu/cpu.c | 4 ++--
src/cpu/cpu.h | 6 +++---
src/cpu/cpu_ppc64.c | 4 ++--
src/cpu/cpu_x86.c | 4 ++--
src/libvirt_private.syms | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/test/test_driver.c | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 995d925..0332d50 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -831,7 +831,7 @@ cpuModelIsAllowed(const char *model,
}
/**
- * cpuGetModels:
+ * virCPUGetModels:
*
* @arch: CPU architecture
* @models: where to store the NULL-terminated list of supported models
@@ -845,7 +845,7 @@ cpuModelIsAllowed(const char *model,
* or -1 on error.
*/
int
-cpuGetModels(virArch arch, char ***models)
+virCPUGetModels(virArch arch, char ***models)
{
struct cpuArchDriver *driver;
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 51bacb7..82912a4 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -105,7 +105,7 @@ typedef virCPUDataPtr
(*cpuArchDataParse) (xmlXPathContextPtr ctxt);
typedef int
-(*cpuArchGetModels) (char ***models);
+(*virCPUArchGetModels)(char ***models);
typedef int
(*virCPUArchTranslate)(virCPUDefPtr cpu,
@@ -128,7 +128,7 @@ struct cpuArchDriver {
virCPUArchDataCheckFeature dataCheckFeature;
cpuArchDataFormat dataFormat;
cpuArchDataParse dataParse;
- cpuArchGetModels getModels;
+ virCPUArchGetModels getModels;
virCPUArchTranslate translate;
};
@@ -220,7 +220,7 @@ cpuModelIsAllowed(const char *model,
ATTRIBUTE_NONNULL(1);
int
-cpuGetModels(virArch arch, char ***models);
+virCPUGetModels(virArch arch, char ***models);
int
virCPUTranslate(virArch arch,
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 21ea0e1..bfe50a3 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -876,7 +876,7 @@ ppc64DriverBaseline(virCPUDefPtr *cpus,
}
static int
-ppc64DriverGetModels(char ***models)
+virCPUppc64DriverGetModels(char ***models)
{
struct ppc64_map *map;
size_t i;
@@ -921,5 +921,5 @@ struct cpuArchDriver cpuDriverPPC64 = {
.guestData = ppc64DriverGuestData,
.baseline = ppc64DriverBaseline,
.update = virCPUppc64Update,
- .getModels = ppc64DriverGetModels,
+ .getModels = virCPUppc64DriverGetModels,
};
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 64f1c47..34c3e5b 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2668,7 +2668,7 @@ virCPUx86DataCheckFeature(const virCPUData *data,
}
static int
-x86GetModels(char ***models)
+virCPUx86GetModels(char ***models)
{
virCPUx86MapPtr map;
size_t i;
@@ -2767,6 +2767,6 @@ struct cpuArchDriver cpuDriverX86 = {
.dataCheckFeature = virCPUx86DataCheckFeature,
.dataFormat = x86CPUDataFormat,
.dataParse = x86CPUDataParse,
- .getModels = x86GetModels,
+ .getModels = virCPUx86GetModels,
.translate = virCPUx86Translate,
};
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ac6a1e1..8b16dc1 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -980,13 +980,13 @@ cpuDataFree;
cpuDataParse;
cpuDecode;
cpuEncode;
-cpuGetModels;
cpuGuestData;
cpuNodeData;
virCPUCheckFeature;
virCPUCompare;
virCPUCompareXML;
virCPUDataCheckFeature;
+virCPUGetModels;
virCPUTranslate;
virCPUUpdate;
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ad98d68..cfd090c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4639,7 +4639,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
virDomainCapsCPUModelsPtr filtered = NULL;
char **models = NULL;
- if (cpuGetModels(domCaps->arch, &models) >= 0) {
+ if (virCPUGetModels(domCaps->arch, &models) >= 0) {
filtered = virDomainCapsCPUModelsFilter(qemuCaps->cpuDefinitions,
(const char **) models);
virStringFreeList(models);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a82e58b..608b67b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18476,7 +18476,7 @@ qemuConnectGetCPUModelNames(virConnectPtr conn,
return -1;
}
- return cpuGetModels(arch, models);
+ return virCPUGetModels(arch, models);
}
static int
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 236874f..cc300f0 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5943,7 +5943,7 @@ testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED,
return -1;
}
- return cpuGetModels(arch, models);
+ return virCPUGetModels(arch, models);
}
static int
--
2.10.2