[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/47] target-s390x: Move TCG initialization to S390
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 24/47] target-s390x: Move TCG initialization to S390CPU initfn |
Date: |
Sat, 16 Feb 2013 16:45:19 +0100 |
Ensures that a QOM-created S390CPU is usable.
Acked-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-s390x/cpu.c | 6 ++++++
target-s390x/helper.c | 7 -------
2 Dateien geändert, 6 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index ee15783..787c937 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -112,6 +112,7 @@ static void s390_cpu_initfn(Object *obj)
{
S390CPU *cpu = S390_CPU(obj);
CPUS390XState *env = &cpu->env;
+ static bool inited;
static int cpu_num = 0;
#if !defined(CONFIG_USER_ONLY)
struct tm tm;
@@ -133,6 +134,11 @@ static void s390_cpu_initfn(Object *obj)
#endif
env->cpu_num = cpu_num++;
env->ext_index = -1;
+
+ if (tcg_enabled() && !inited) {
+ inited = true;
+ s390x_translate_init();
+ }
}
static void s390_cpu_finalize(Object *obj)
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index d3bb456..1183b45 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -74,16 +74,9 @@ S390CPU *cpu_s390x_init(const char *cpu_model)
{
S390CPU *cpu;
CPUS390XState *env;
- static int inited;
cpu = S390_CPU(object_new(TYPE_S390_CPU));
env = &cpu->env;
-
- if (tcg_enabled() && !inited) {
- inited = 1;
- s390x_translate_init();
- }
-
env->cpu_model_str = cpu_model;
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
--
1.7.10.4
- [Qemu-devel] [PATCH 12/47] target-s390x: Introduce QOM realizefn for S390CPU, (continued)
- [Qemu-devel] [PATCH 12/47] target-s390x: Introduce QOM realizefn for S390CPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 15/47] target-unicore32: Introduce QOM realizefn for UniCore32CPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 11/47] target-mips: Introduce QOM realizefn for MIPSCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 13/47] target-sh4: Introduce QOM realizefn for SuperHCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 19/47] target-lm32: Move TCG initialization to LM32CPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 18/47] target-cris: Move TCG initialization to CRISCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 17/47] target-arm: Move TCG initialization to ARMCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 20/47] target-m68k: Move TCG initialization to M68kCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 21/47] target-microblaze: Move TCG initialization to MicroBlazeCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 16/47] target-xtensa: Introduce QOM realizefn for XtensaCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 24/47] target-s390x: Move TCG initialization to S390CPU initfn,
Andreas Färber <=
- [Qemu-devel] [PATCH 22/47] target-mips: Move TCG initialization to MIPSCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 25/47] target-sh4: Move TCG initialization to SuperHCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 23/47] target-ppc: Move TCG initialization to PowerPCCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 26/47] target-sparc: Move TCG initialization to SPARCCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 43/47] spapr_hcall: Replace open-coded CPU loop with qemu_get_cpu(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 36/47] cpu: Move running field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 29/47] ppc405_uc: Pass PowerPCCPU to ppc40x_{core, chip, system}_reset(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 27/47] target-unicore32: Move TCG initialization to UniCore32CPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 45/47] target-lm32: Drop unused cpu_lm32_close() prototype, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 30/47] target-m68k: Return M68kCPU from cpu_m68k_init(), Andreas Färber, 2013/02/16