From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C4H-0000PJ-1z for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:30:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6C41-0001W5-5W for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:30:00 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39861 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C40-0001Ve-SV for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:45 -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 C1A3090072 for ; Sat, 10 Mar 2012 03:29:43 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 10 Mar 2012 03:28:14 +0100 Message-Id: <1331346496-10736-43-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 42/44] xtensa 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/xtensa_*.[hc]; do sed -i "s/CPUState/CPUXtensaState/g" $file done Signed-off-by: Andreas F=C3=A4rber --- hw/xtensa_lx60.c | 4 ++-- hw/xtensa_pic.c | 16 ++++++++-------- hw/xtensa_sim.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 80ba4d7..afdef49 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -148,7 +148,7 @@ static uint64_t translate_phys_addr(void *env, uint64= _t addr) =20 static void lx60_reset(void *opaque) { - CPUState *env =3D opaque; + CPUXtensaState *env =3D opaque; =20 cpu_state_reset(env); } @@ -164,7 +164,7 @@ static void lx_init(const LxBoardDesc *board, int be =3D 0; #endif MemoryRegion *system_memory =3D get_system_memory(); - CPUState *env =3D NULL; + CPUXtensaState *env =3D NULL; MemoryRegion *ram, *rom, *system_io; DriveInfo *dinfo; pflash_t *flash =3D NULL; diff --git a/hw/xtensa_pic.c b/hw/xtensa_pic.c index 71d5fc8..653ded6 100644 --- a/hw/xtensa_pic.c +++ b/hw/xtensa_pic.c @@ -29,7 +29,7 @@ #include "qemu-log.h" #include "qemu-timer.h" =20 -void xtensa_advance_ccount(CPUState *env, uint32_t d) +void xtensa_advance_ccount(CPUXtensaState *env, uint32_t d) { uint32_t old_ccount =3D env->sregs[CCOUNT]; =20 @@ -45,7 +45,7 @@ void xtensa_advance_ccount(CPUState *env, uint32_t d) } } =20 -void check_interrupts(CPUState *env) +void check_interrupts(CPUXtensaState *env) { int minlevel =3D xtensa_get_cintlevel(env); uint32_t int_set_enabled =3D env->sregs[INTSET] & env->sregs[INTENAB= LE]; @@ -84,7 +84,7 @@ void check_interrupts(CPUState *env) =20 static void xtensa_set_irq(void *opaque, int irq, int active) { - CPUState *env =3D opaque; + CPUXtensaState *env =3D opaque; =20 if (irq >=3D env->config->ninterrupt) { qemu_log("%s: bad IRQ %d\n", __func__, irq); @@ -101,12 +101,12 @@ static void xtensa_set_irq(void *opaque, int irq, i= nt active) } } =20 -void xtensa_timer_irq(CPUState *env, uint32_t id, uint32_t active) +void xtensa_timer_irq(CPUXtensaState *env, uint32_t id, uint32_t active) { qemu_set_irq(env->irq_inputs[env->config->timerint[id]], active); } =20 -void xtensa_rearm_ccompare_timer(CPUState *env) +void xtensa_rearm_ccompare_timer(CPUXtensaState *env) { int i; uint32_t wake_ccount =3D env->sregs[CCOUNT] - 1; @@ -125,7 +125,7 @@ void xtensa_rearm_ccompare_timer(CPUState *env) =20 static void xtensa_ccompare_cb(void *opaque) { - CPUState *env =3D opaque; + CPUXtensaState *env =3D opaque; =20 if (env->halted) { env->halt_clock =3D qemu_get_clock_ns(vm_clock); @@ -137,7 +137,7 @@ static void xtensa_ccompare_cb(void *opaque) } } =20 -void xtensa_irq_init(CPUState *env) +void xtensa_irq_init(CPUXtensaState *env) { env->irq_inputs =3D (void **)qemu_allocate_irqs( xtensa_set_irq, env, env->config->ninterrupt); @@ -148,7 +148,7 @@ void xtensa_irq_init(CPUState *env) } } =20 -void *xtensa_get_extint(CPUState *env, unsigned extint) +void *xtensa_get_extint(CPUXtensaState *env, unsigned extint) { if (extint < env->config->nextint) { unsigned irq =3D env->config->extint[extint]; diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index 445cfde..c7e05dc 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa_sim.c @@ -47,7 +47,7 @@ static void sim_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *env =3D NULL; + CPUXtensaState *env =3D NULL; MemoryRegion *ram, *rom; int n; =20 --=20 1.7.7