From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VS-0001MO-UP for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VQ-0000sZ-36 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55415 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VP-0000s2-Kd for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:15 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:56 +0200 Message-Id: <1336318514-30906-57-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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 for-next 56/74] target-microblaze: Let cpu_mb_init() return MicroBlazeCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , "Edgar E. Iglesias" Since qemu_init_vcpu() is no-op for CONFIG_USER_ONLY drop the env variable that is now unused there. Let cpu_init() return CPUMBState for backwards compatibility. Signed-off-by: Andreas F=C3=A4rber --- target-microblaze/cpu.h | 4 ++-- target-microblaze/translate.c | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 718d5bb..60870cb 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -268,7 +268,7 @@ struct CPUMBState { =20 #include "cpu-qom.h" =20 -CPUMBState *cpu_mb_init(const char *cpu_model); +MicroBlazeCPU *cpu_mb_init(const char *cpu_model); int cpu_mb_exec(CPUMBState *s); void cpu_mb_close(CPUMBState *s); void do_interrupt(CPUMBState *env); @@ -291,7 +291,7 @@ enum { #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 =20 -#define cpu_init cpu_mb_init +#define cpu_init(model) (&cpu_mb_init(model)->env) #define cpu_exec cpu_mb_exec #define cpu_gen_code cpu_mb_gen_code #define cpu_signal_handler cpu_mb_signal_handler diff --git a/target-microblaze/translate.c b/target-microblaze/translate.= c index 742b395..afa6255 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1889,21 +1889,20 @@ void cpu_dump_state (CPUMBState *env, FILE *f, fp= rintf_function cpu_fprintf, cpu_fprintf(f, "\n\n"); } =20 -CPUMBState *cpu_mb_init (const char *cpu_model) +MicroBlazeCPU *cpu_mb_init(const char *cpu_model) { MicroBlazeCPU *cpu; - CPUMBState *env; static int tcg_initialized =3D 0; int i; =20 cpu =3D MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); - env =3D &cpu->env; =20 cpu_reset(CPU(cpu)); - qemu_init_vcpu(env); + qemu_init_vcpu(&cpu->env); =20 - if (tcg_initialized) - return env; + if (tcg_initialized) { + return cpu; + } =20 tcg_initialized =3D 1; =20 @@ -1937,7 +1936,7 @@ CPUMBState *cpu_mb_init (const char *cpu_model) #define GEN_HELPER 2 #include "helper.h" =20 - return env; + return cpu; } =20 void cpu_state_reset(CPUMBState *env) --=20 1.7.7