[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next 30/59] target-s390x: Let cpu_s390x_init() r
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next 30/59] target-s390x: Let cpu_s390x_init() return S390CPU |
Date: |
Wed, 23 May 2012 05:07:53 +0200 |
Let cpu_init() return CPUS390XState for backwards compatibility.
Signed-off-by: Andreas Färber <address@hidden>
---
target-s390x/cpu.c | 2 +-
target-s390x/cpu.h | 8 ++++----
target-s390x/helper.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index f183213..619b202 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -20,7 +20,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
-#include "cpu-qom.h"
+#include "cpu.h"
#include "qemu-common.h"
#include "qemu-timer.h"
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 2f3f394..10bfab0 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -105,6 +105,8 @@ typedef struct CPUS390XState {
QEMUTimer *cpu_timer;
} CPUS390XState;
+#include "cpu-qom.h"
+
#if defined(CONFIG_USER_ONLY)
static inline void cpu_clone_regs(CPUS390XState *env, target_ulong newsp)
{
@@ -271,7 +273,7 @@ static inline int get_ilc(uint8_t opc)
#define ILC_LATER_INC_2 0x22
-CPUS390XState *cpu_s390x_init(const char *cpu_model);
+S390CPU *cpu_s390x_init(const char *cpu_model);
void s390x_translate_init(void);
int cpu_s390x_exec(CPUS390XState *s);
void cpu_s390x_close(CPUS390XState *s);
@@ -340,7 +342,7 @@ static inline void cpu_set_tls(CPUS390XState *env,
target_ulong newtls)
env->aregs[1] = newtls & 0xffffffffULL;
}
-#define cpu_init cpu_s390x_init
+#define cpu_init(model) (&cpu_s390x_init(model)->env)
#define cpu_exec cpu_s390x_exec
#define cpu_gen_code cpu_s390x_gen_code
#define cpu_signal_handler cpu_s390x_signal_handler
@@ -994,6 +996,4 @@ static inline void cpu_pc_from_tb(CPUS390XState *env,
TranslationBlock* tb)
env->psw.addr = tb->pc;
}
-#include "cpu-qom.h"
-
#endif
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index a34a35b..d0a1180 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -70,7 +70,7 @@ void s390x_cpu_timer(void *opaque)
}
#endif
-CPUS390XState *cpu_s390x_init(const char *cpu_model)
+S390CPU *cpu_s390x_init(const char *cpu_model)
{
S390CPU *cpu;
CPUS390XState *env;
@@ -86,7 +86,7 @@ CPUS390XState *cpu_s390x_init(const char *cpu_model)
env->cpu_model_str = cpu_model;
qemu_init_vcpu(env);
- return env;
+ return cpu;
}
#if defined(CONFIG_USER_ONLY)
--
1.7.7
- [Qemu-devel] [PATCH qom-next 14/59] cpu: Move stopped field to CPUState, (continued)
- [Qemu-devel] [PATCH qom-next 14/59] cpu: Move stopped field to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 05/59] apic: Replace cpu_env pointer by X86CPU link, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 08/59] Makefile.dis: Add include/ to include path, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 17/59] cpu: Move halt_cond to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 12/59] cpu: Move stop field to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 02/59] cpu: Move CPU_COMMON_THREAD into CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 18/59] cpus: Pass CPUState to qemu_tcg_cpu_thread_fn, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 21/59] ppc: Pass PowerPCCPU to ppc970_set_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 23/59] ppc: Pass PowerPCCPU to ppc40x_set_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 29/59] target-ppc: Rename kvm_kick_{env => cpu} and pass PowerPCCPU, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 30/59] target-s390x: Let cpu_s390x_init() return S390CPU,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next 13/59] ppce500_spin: Store PowerPCCPU in SpinKick, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 33/59] target-s390x: Pass S390CPU to s390_cpu_restart(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 24/59] ppc: Pass PowerPCCPU to ppce500_set_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 32/59] s390-virtio: Let s390_cpu_addr2state() return S390CPU, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 26/59] sun4m: Pass SPARCCPU to cpu_kick_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 36/59] cpus: Pass CPUState to flush_queued_work(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 28/59] sun4u: Pass SPARCCPU to cpu_kick_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 15/59] cpus: Pass CPUState to cpu_is_stopped(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 37/59] cpus: Pass CPUState to qemu_wait_io_event_common(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 25/59] sun4m: Pass SPARCCPU to cpu_set_irq(), Andreas Färber, 2012/05/22