From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3NJ-0005HA-JQ for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:02:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl3NG-0000cQ-UO for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:02:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3NG-0000bw-Lj for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:02:46 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBIK2kvD005312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 Dec 2012 15:02:46 -0500 Received: from blackpad.lan.raisama.net (vpn1-6-125.gru2.redhat.com [10.97.6.125]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBIK2j67002269 for ; Tue, 18 Dec 2012 15:02:45 -0500 From: Eduardo Habkost Date: Tue, 18 Dec 2012 18:03:59 -0200 Message-Id: <1355861053-11460-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1355861053-11460-1-git-send-email-ehabkost@redhat.com> References: <1355861053-11460-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 06/20] m68k: convert cpu_init to QOM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Eduardo Habkost --- target-m68k/cpu.h | 5 ++--- target-m68k/helper.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index fbb35dc..9823267 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -116,7 +116,7 @@ typedef struct CPUM68KState { #include "cpu-qom.h" void m68k_tcg_init(void); -CPUM68KState *cpu_m68k_init(const char *cpu_model); +CPUState *cpu_m68k_init(const char *cpu_model); int cpu_m68k_exec(CPUM68KState *s); void do_interrupt(CPUM68KState *env1); void do_interrupt_m68k_hardirq(CPUM68KState *env1); @@ -214,8 +214,7 @@ void register_m68k_insns (CPUM68KState *env); #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 -#define cpu_init(m) ENV_GET_CPU(old_cpu_init(m)) -#define old_cpu_init cpu_m68k_init +#define cpu_init cpu_m68k_init #define cpu_exec cpu_m68k_exec #define cpu_gen_code cpu_m68k_gen_code #define cpu_signal_handler cpu_m68k_signal_handler diff --git a/target-m68k/helper.c b/target-m68k/helper.c index a5d0100..6b6f5dd 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -98,7 +98,7 @@ static int fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n) return 0; } -CPUM68KState *cpu_m68k_init(const char *cpu_model) +CPUState *cpu_m68k_init(const char *cpu_model) { M68kCPU *cpu; CPUM68KState *env; @@ -126,7 +126,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) cpu_reset(ENV_GET_CPU(env)); qemu_init_vcpu(env); - return env; + return CPU(cpu); } void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op) -- 1.7.11.7