From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C4D-0000FT-HA for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6C3w-0001UT-Et for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:57 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39851 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C3w-0001Ty-5i for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:40 -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 156598FC92 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:04 +0100 Message-Id: <1331346496-10736-33-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 32/44] cris 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/cris-boot.[hc] hw/cris_pic_cpu.c hw/axis_dev88.c hw/etra= xfs.h hw/etraxfs_ser.c; do sed -i "s/CPUState/CPUCRISState/g" $file done Signed-off-by: Andreas F=C3=A4rber --- hw/axis_dev88.c | 2 +- hw/cris-boot.c | 4 ++-- hw/cris-boot.h | 2 +- hw/cris_pic_cpu.c | 4 ++-- hw/etraxfs.h | 2 +- hw/etraxfs_ser.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index c9301fd..2304e35 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -247,7 +247,7 @@ void axisdev88_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; + CPUCRISState *env; DeviceState *dev; SysBusDevice *s; DriveInfo *nand; diff --git a/hw/cris-boot.c b/hw/cris-boot.c index ade517d..ca6c52f 100644 --- a/hw/cris-boot.c +++ b/hw/cris-boot.c @@ -29,7 +29,7 @@ =20 static void main_cpu_reset(void *opaque) { - CPUState *env =3D opaque; + CPUCRISState *env =3D opaque; struct cris_load_info *li; =20 li =3D env->load_info; @@ -60,7 +60,7 @@ static uint64_t translate_kernel_address(void *opaque, = uint64_t addr) return addr - 0x80000000LL; } =20 -void cris_load_image(CPUState *env, struct cris_load_info *li) +void cris_load_image(CPUCRISState *env, struct cris_load_info *li) { uint64_t entry, high; int kcmdline_len; diff --git a/hw/cris-boot.h b/hw/cris-boot.h index e9caf8d..ecb9779 100644 --- a/hw/cris-boot.h +++ b/hw/cris-boot.h @@ -8,4 +8,4 @@ struct cris_load_info target_phys_addr_t entry; }; =20 -void cris_load_image(CPUState *env, struct cris_load_info *li); +void cris_load_image(CPUCRISState *env, struct cris_load_info *li); diff --git a/hw/cris_pic_cpu.c b/hw/cris_pic_cpu.c index 06ae484..3da0e86 100644 --- a/hw/cris_pic_cpu.c +++ b/hw/cris_pic_cpu.c @@ -30,7 +30,7 @@ =20 static void cris_pic_cpu_handler(void *opaque, int irq, int level) { - CPUState *env =3D (CPUState *)opaque; + CPUCRISState *env =3D (CPUCRISState *)opaque; int type =3D irq ? CPU_INTERRUPT_NMI : CPU_INTERRUPT_HARD; =20 if (level) @@ -39,7 +39,7 @@ static void cris_pic_cpu_handler(void *opaque, int irq,= int level) cpu_reset_interrupt(env, type); } =20 -qemu_irq *cris_pic_init_cpu(CPUState *env) +qemu_irq *cris_pic_init_cpu(CPUCRISState *env) { return qemu_allocate_irqs(cris_pic_cpu_handler, env, 2); } diff --git a/hw/etraxfs.h b/hw/etraxfs.h index 24e8fd8..c62f94b 100644 --- a/hw/etraxfs.h +++ b/hw/etraxfs.h @@ -25,7 +25,7 @@ #include "net.h" #include "etraxfs_dma.h" =20 -qemu_irq *cris_pic_init_cpu(CPUState *env); +qemu_irq *cris_pic_init_cpu(CPUCRISState *env); =20 /* Instantiate an ETRAXFS Ethernet MAC. */ static inline DeviceState * diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index cecd819..5f16b17 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -78,7 +78,7 @@ static uint64_t ser_read(void *opaque, target_phys_addr_t addr, unsigned int size) { struct etrax_serial *s =3D opaque; - D(CPUState *env =3D s->env); + D(CPUCRISState *env =3D s->env); uint32_t r =3D 0; =20 addr >>=3D 2; @@ -116,7 +116,7 @@ ser_write(void *opaque, target_phys_addr_t addr, struct etrax_serial *s =3D opaque; uint32_t value =3D val64; unsigned char ch =3D val64; - D(CPUState *env =3D s->env); + D(CPUCRISState *env =3D s->env); =20 D(qemu_log("%s " TARGET_FMT_plx "=3D%x\n", __func__, addr, value)); addr >>=3D 2; --=20 1.7.7