[Qemu-devel] [PATCH 11/17] target-i386: return Error from cpu_x86_find_by_name()

[Eduardo Habkost]

It will allow us to use property setters there later.

Signed-off-by: Igor Mammedov <address@hidden>
[ehabkost: rebased on top of CPU classes work in progress]
Signed-off-by: Eduardo Habkost <address@hidden>
---
v2:
    - style change, add braces (requested by Blue Swirl)
    - removed unused error_is_set(errp) in properties set loop
v3:
    - removed unnecessary whitespace change

v4 (ehabkost):
    - rebased on top of CPU classes work in progress
    - reworded commit message
---
 target-i386/cpu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3f04054..214a292 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1147,7 +1147,7 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor 
*v, void *opaque,
 }
 
 static int cpu_x86_find_by_name(X86CPUDefinition *x86_cpu_def,
-                                const char *cpu_model)
+                                const char *cpu_model, Error **errp)
 {
     unsigned int i;
     X86CPUDefinition *def;
@@ -1320,6 +1320,9 @@ static int cpu_x86_find_by_name(X86CPUDefinition 
*x86_cpu_def,
 
 error:
     g_free(s);
+    if (!error_is_set(errp)) {
+        error_set(errp, QERR_INVALID_PARAMETER_COMBINATION);
+    }
     return -1;
 }
 
@@ -1502,7 +1505,7 @@ X86CPU *cpu_x86_init(const char *cpu_model)
 
     memset(def, 0, sizeof(*def));
 
-    if (cpu_x86_find_by_name(def, cpu_model) < 0) {
+    if (cpu_x86_find_by_name(def, cpu_model, &error) < 0) {
         goto error;
     }
 
-- 
1.7.11.7