[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function |
Date: |
Tue, 3 Feb 2015 17:39:25 -0200 |
Instead of putting extra logic inside cpu.h, just do everything inside
cpu_x86_init_user().
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 6 +++---
target-i386/cpu.h | 12 +++---------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 5e4010c..43d958e 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2149,7 +2149,7 @@ out:
return cpu;
}
-X86CPU *cpu_x86_init_user(const char *cpu_model)
+CPUX86State *cpu_x86_init_user(const char *cpu_model)
{
Error *error = NULL;
X86CPU *cpu;
@@ -2167,10 +2167,10 @@ out:
error_free(error);
if (cpu != NULL) {
object_unref(OBJECT(cpu));
- cpu = NULL;
}
+ return NULL;
}
- return cpu;
+ return &cpu->env;
}
static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data)
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 41d7f0a..d5bd74e 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -982,7 +982,6 @@ typedef struct CPUX86State {
#include "cpu-qom.h"
-X86CPU *cpu_x86_init_user(const char *cpu_model);
X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
Error **errp);
int cpu_x86_exec(CPUX86State *s);
@@ -1171,14 +1170,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
# define PHYS_ADDR_MASK 0xfffffffffLL
# endif
-static inline CPUX86State *cpu_init(const char *cpu_model)
-{
- X86CPU *cpu = cpu_x86_init_user(cpu_model);
- if (cpu == NULL) {
- return NULL;
- }
- return &cpu->env;
-}
+/* CPU creation function for *-user */
+CPUX86State *cpu_x86_init_user(const char *cpu_model);
+#define cpu_init cpu_x86_init_user
#define cpu_exec cpu_x86_exec
#define cpu_gen_code cpu_x86_gen_code
--
2.1.0
- [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 2/9] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i386, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 5/9] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 9/9] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 6/9] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitly set before CPU realize, Eduardo Habkost, 2015/02/03
- Re: [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Paolo Bonzini, 2015/02/04