From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C4A-00005H-EQ for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6C3x-0001Uv-O0 for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:53 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39854 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C3x-0001UX-Er for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:41 -0500 Received: from relay2.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 59E148FB75 for ; Sat, 10 Mar 2012 03:29:40 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 10 Mar 2012 03:28:07 +0100 Message-Id: <1331346496-10736-36-git-send-email-afaerber@suse.de> In-Reply-To: <1331346496-10736-1-git-send-email-afaerber@suse.de> References: <1330893156-26569-1-git-send-email-afaerber@suse.de> <1331346496-10736-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 RFC v4 35/44] m68k hw/: Don't use CPUState 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?= Scripted conversion: for file in hw/an5206.c hw/dummy_m68k.c hw/mcf.h hw/mcf5206.c hw/mcf520= 8.c hw/mcf_intc.c; do sed -i "s/CPUState/CPUM68KState/g" $file done Signed-off-by: Andreas F=C3=A4rber --- hw/an5206.c | 2 +- hw/dummy_m68k.c | 2 +- hw/mcf.h | 4 ++-- hw/mcf5206.c | 4 ++-- hw/mcf5208.c | 2 +- hw/mcf_intc.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/an5206.c b/hw/an5206.c index d57306d..25407c0 100644 --- a/hw/an5206.c +++ b/hw/an5206.c @@ -24,7 +24,7 @@ static void an5206_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { - CPUState *env; + CPUM68KState *env; int kernel_size; uint64_t elf_entry; target_phys_addr_t entry; diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index e3c5740..7cc7a99 100644 --- a/hw/dummy_m68k.c +++ b/hw/dummy_m68k.c @@ -21,7 +21,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { - CPUState *env; + CPUM68KState *env; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); int kernel_size; diff --git a/hw/mcf.h b/hw/mcf.h index baa790b..19a8b54 100644 --- a/hw/mcf.h +++ b/hw/mcf.h @@ -17,7 +17,7 @@ void mcf_uart_mm_init(struct MemoryRegion *sysmem, /* mcf_intc.c */ qemu_irq *mcf_intc_init(struct MemoryRegion *sysmem, target_phys_addr_t base, - CPUState *env); + CPUM68KState *env); =20 /* mcf_fec.c */ void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd, @@ -25,6 +25,6 @@ void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo = *nd, =20 /* mcf5206.c */ qemu_irq *mcf5206_init(struct MemoryRegion *sysmem, - uint32_t base, CPUState *env); + uint32_t base, CPUM68KState *env); =20 #endif diff --git a/hw/mcf5206.c b/hw/mcf5206.c index 5110d83..539b391 100644 --- a/hw/mcf5206.c +++ b/hw/mcf5206.c @@ -145,7 +145,7 @@ static m5206_timer_state *m5206_timer_init(qemu_irq i= rq) /* System Integration Module. */ =20 typedef struct { - CPUState *env; + CPUM68KState *env; MemoryRegion iomem; m5206_timer_state *timer[2]; void *uart[2]; @@ -525,7 +525,7 @@ static const MemoryRegionOps m5206_mbar_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, CPUState *en= v) +qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, CPUM68KState= *env) { m5206_mbar_state *s; qemu_irq *pic; diff --git a/hw/mcf5208.c b/hw/mcf5208.c index aa11a75..d3ebe8d 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -192,7 +192,7 @@ static void mcf5208evb_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { - CPUState *env; + CPUM68KState *env; int kernel_size; uint64_t elf_entry; target_phys_addr_t entry; diff --git a/hw/mcf_intc.c b/hw/mcf_intc.c index 0b498dd..cc1a5f3 100644 --- a/hw/mcf_intc.c +++ b/hw/mcf_intc.c @@ -16,7 +16,7 @@ typedef struct { uint64_t ifr; uint64_t enabled; uint8_t icr[64]; - CPUState *env; + CPUM68KState *env; int active_vector; } mcf_intc_state; =20 @@ -139,7 +139,7 @@ static const MemoryRegionOps mcf_intc_ops =3D { =20 qemu_irq *mcf_intc_init(MemoryRegion *sysmem, target_phys_addr_t base, - CPUState *env) + CPUM68KState *env) { mcf_intc_state *s; =20 --=20 1.7.7