[libvirt] [PATCH 1/8] cpu: Introduce cpuModelIsAllowed internal API
The API can be used to check if the model is on the supported models
list, which needs to be done in several places.
---
src/cpu/cpu.c | 17 +++++++++++++++++
src/cpu/cpu.h | 5 +++++
src/cpu/cpu_generic.c | 19 +++++--------------
src/cpu/cpu_x86.c | 11 +----------
4 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 53c4cc3..b41fb38 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -442,3 +442,20 @@ cpuHasFeature(virArch arch,
return driver->hasFeature(data, feature);
}
+
+bool
+cpuModelIsAllowed(const char *model,
+ const char **models,
+ unsigned int nmodels)
+{
+ unsigned int i;
+
+ if (!models || !nmodels)
+ return true;
+
+ for (i = 0; i < nmodels; i++) {
+ if (models[i] && STREQ(models[i], model))
+ return true;
+ }
+ return false;
+}
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 5153b62..7b645f7 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -163,4 +163,9 @@ cpuHasFeature(virArch arch,
const char *feature);
+bool
+cpuModelIsAllowed(const char *model,
+ const char **models,
+ unsigned int nmodels);
+
#endif /* __VIR_CPU_H__ */
diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
index b10ff47..44440bd 100644
--- a/src/cpu/cpu_generic.c
+++ b/src/cpu/cpu_generic.c
@@ -123,20 +123,11 @@ genericBaseline(virCPUDefPtr *cpus,
unsigned int count;
unsigned int i, j;
- if (models) {
- bool found = false;
- for (i = 0; i < nmodels; i++) {
- if (STREQ(cpus[0]->model, models[i])) {
- found = true;
- break;
- }
- }
- if (!found) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("CPU model '%s' is not support by
hypervisor"),
- cpus[0]->model);
- goto error;
- }
+ if (!cpuModelIsAllowed(cpus[0]->model, models, nmodels)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("CPU model %s is not supported by hypervisor"),
+ cpus[0]->model);
+ goto error;
}
if (VIR_ALLOC(cpu) < 0 ||
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index cb21910..ac00b3c 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1325,16 +1325,7 @@ x86Decode(virCPUDefPtr cpu,
candidate = map->models;
while (candidate != NULL) {
- bool allowed = (models == NULL);
-
- for (i = 0; i < nmodels; i++) {
- if (models && models[i] && STREQ(models[i],
candidate->name)) {
- allowed = true;
- break;
- }
- }
-
- if (!allowed) {
+ if (!cpuModelIsAllowed(candidate->name, models, nmodels)) {
if (preferred && STREQ(candidate->name, preferred)) {
if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--
1.8.0.2