[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 11/13] check for NULL cpu_model outside cpu_x86_find_b
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 11/13] check for NULL cpu_model outside cpu_x86_find_by_name |
Date: |
Thu, 16 Aug 2012 13:59:10 -0300 |
cpu_x86_find_by_name() will go away when we move to CPU model classes.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 2e24e00..9209bb1 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1402,11 +1402,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu,
X86CPUDefinition *x86_cpu_def,
{
X86CPUModelTableEntry *def;
- if (!cpu_model) {
- error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cpu_model", "NULL");
- return -1;
- }
-
for (def = x86_defs; def; def = def->next) {
if (!strcmp(cpu_model, def->name)) {
break;
@@ -1521,6 +1516,11 @@ X86CPU *cpu_x86_create(const char *cpu_model)
env = &cpu->env;
env->cpu_model_str = cpu_model;
+ if (!cpu_model) {
+ error_set(&error, QERR_INVALID_PARAMETER_VALUE, "cpu_model", "NULL");
+ goto error;
+ }
+
if (cpu_x86_find_by_name(cpu, def, name, &error) < 0) {
goto error;
}
--
1.7.11.2
- [Qemu-devel] [RFC 00/13] CPU init cleanup + CPU model classes (v2), Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 08/13] cpu_x86_register: always initialize 'name' and 'features', Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 02/13] x86_cpudef_setup: coding style change, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 04/13] move CPU x86 object creation to cpu.c, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 13/13] HACK to initialize types later, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 11/13] check for NULL cpu_model outside cpu_x86_find_by_name,
Eduardo Habkost <=
- [Qemu-devel] [RFC 07/13] cpu_x86_create: move error handling to end of function, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 03/13] i386: x86_def_t: rename 'flags' field, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 01/13] target-i386/cpu.c: coding style fixes, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 05/13] rename x86_def_t to X86CPUDefinition, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 09/13] kill cpu_x86_register(), Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 06/13] move X86CPUDefinition to cpu-qom.h, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 10/13] cpu_x86_create: reorder parsing of CPU model string and creation of CPU object, Eduardo Habkost, 2012/08/16
- [Qemu-devel] [RFC 12/13] register a class for each CPU model (v2), Eduardo Habkost, 2012/08/16