From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C49-0008VP-PT 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-0001Ul-BQ for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:53 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39853 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C3x-0001UP-20 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 EC5F48FFEB for ; Sat, 10 Mar 2012 03:29:39 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 10 Mar 2012 03:28:06 +0100 Message-Id: <1331346496-10736-35-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 34/44] lm32 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/lm32_boards.c hw/milkymist.c; do sed -i "s/CPUState/CPULM32State/g" $file done Signed-off-by: Andreas F=C3=A4rber --- hw/lm32_boards.c | 10 +++++----- hw/milkymist.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c index 51c8a0f..4dd4f0a 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32_boards.c @@ -31,7 +31,7 @@ #include "exec-memory.h" =20 typedef struct { - CPUState *env; + CPULM32State *env; target_phys_addr_t bootstrap_pc; target_phys_addr_t flash_base; target_phys_addr_t hwsetup_base; @@ -42,7 +42,7 @@ typedef struct { =20 static void cpu_irq_handler(void *opaque, int irq, int level) { - CPUState *env =3D opaque; + CPULM32State *env =3D opaque; =20 if (level) { cpu_interrupt(env, CPU_INTERRUPT_HARD); @@ -54,7 +54,7 @@ static void cpu_irq_handler(void *opaque, int irq, int = level) static void main_cpu_reset(void *opaque) { ResetInfo *reset_info =3D opaque; - CPUState *env =3D reset_info->env; + CPULM32State *env =3D reset_info->env; =20 cpu_state_reset(env); =20 @@ -75,7 +75,7 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_m= odel) { - CPUState *env; + CPULM32State *env; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *phys_ram =3D g_new(MemoryRegion, 1); @@ -163,7 +163,7 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not= _used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_m= odel) { - CPUState *env; + CPULM32State *env; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *phys_ram =3D g_new(MemoryRegion, 1); diff --git a/hw/milkymist.c b/hw/milkymist.c index 7ec6554..8bb6a97 100644 --- a/hw/milkymist.c +++ b/hw/milkymist.c @@ -37,7 +37,7 @@ #define KERNEL_LOAD_ADDR 0x40000000 =20 typedef struct { - CPUState *env; + CPULM32State *env; target_phys_addr_t bootstrap_pc; target_phys_addr_t flash_base; target_phys_addr_t initrd_base; @@ -47,7 +47,7 @@ typedef struct { =20 static void cpu_irq_handler(void *opaque, int irq, int level) { - CPUState *env =3D opaque; + CPULM32State *env =3D opaque; =20 if (level) { cpu_interrupt(env, CPU_INTERRUPT_HARD); @@ -59,7 +59,7 @@ static void cpu_irq_handler(void *opaque, int irq, int = level) static void main_cpu_reset(void *opaque) { ResetInfo *reset_info =3D opaque; - CPUState *env =3D reset_info->env; + CPULM32State *env =3D reset_info->env; =20 cpu_state_reset(env); =20 @@ -79,7 +79,7 @@ milkymist_init(ram_addr_t ram_size_not_used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_m= odel) { - CPUState *env; + CPULM32State *env; int kernel_size; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); --=20 1.7.7