From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wn-0000bG-DR for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wk-0005h4-CM for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35596 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wk-0005gR-3p for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:10 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 18E38975D0 for ; Wed, 23 May 2012 05:09:09 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:53 +0200 Message-Id: <1337742502-28565-31-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 30/59] target-s390x: Let cpu_s390x_init() return S390CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Let cpu_init() return CPUS390XState for backwards compatibility. Signed-off-by: Andreas F=C3=A4rber --- 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 @@ * */ =20 -#include "cpu-qom.h" +#include "cpu.h" #include "qemu-common.h" #include "qemu-timer.h" =20 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; =20 +#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 =20 =20 -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, ta= rget_ulong newtls) env->aregs[1] =3D newtls & 0xffffffffULL; } =20 -#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 =3D tb->pc; } =20 -#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 =20 -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) =20 env->cpu_model_str =3D cpu_model; qemu_init_vcpu(env); - return env; + return cpu; } =20 #if defined(CONFIG_USER_ONLY) --=20 1.7.7