From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C4B-0000A4-QD 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 1S6C40-0001Vj-Ab for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:55 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39859 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C40-0001VG-1z for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:44 -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 ED59D8FE2D for ; Sat, 10 Mar 2012 03:29:42 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 10 Mar 2012 03:28:12 +0100 Message-Id: <1331346496-10736-41-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 40/44] sh4 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/sh.h hw/shix.c hw/r2d.c; do sed -i "s/CPUState/CPUSH4State/g" $file done Signed-off-by: Andreas F=C3=A4rber --- hw/r2d.c | 6 +++--- hw/sh.h | 2 +- hw/shix.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/r2d.c b/hw/r2d.c index ae327a7..c55de01 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -192,14 +192,14 @@ static qemu_irq *r2d_fpga_init(MemoryRegion *sysmem= , } =20 typedef struct ResetData { - CPUState *env; + CPUSH4State *env; uint32_t vector; } ResetData; =20 static void main_cpu_reset(void *opaque) { ResetData *s =3D (ResetData *)opaque; - CPUState *env =3D s->env; + CPUSH4State *env =3D s->env; =20 cpu_state_reset(env); env->pc =3D s->vector; @@ -224,7 +224,7 @@ static void r2d_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *env; + CPUSH4State *env; ResetData *reset_info; struct SH7750State *s; MemoryRegion *sdram =3D g_new(MemoryRegion, 1); diff --git a/hw/sh.h b/hw/sh.h index 6488db2..40df18c 100644 --- a/hw/sh.h +++ b/hw/sh.h @@ -11,7 +11,7 @@ struct SH7750State; struct MemoryRegion; =20 -struct SH7750State *sh7750_init(CPUState * cpu, struct MemoryRegion *sys= mem); +struct SH7750State *sh7750_init(CPUSH4State * cpu, struct MemoryRegion *= sysmem); =20 typedef struct { /* The callback will be triggered if any of the designated lines cha= nge */ diff --git a/hw/shix.c b/hw/shix.c index e259c17..dd9ce17 100644 --- a/hw/shix.c +++ b/hw/shix.c @@ -43,7 +43,7 @@ static void shix_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { int ret; - CPUState *env; + CPUSH4State *env; struct SH7750State *s; MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *rom =3D g_new(MemoryRegion, 1); --=20 1.7.7