[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 41/43] xtensa hw/: Don't use CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v5 41/43] xtensa hw/: Don't use CPUState |
Date: |
Wed, 14 Mar 2012 22:42:54 +0100 |
Scripted conversion:
for file in hw/xtensa_*.[hc]; do
sed -i "s/CPUState/CPUXtensaState/g" $file
done
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Anthony Liguori <address@hidden>
---
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)
static void lx60_reset(void *opaque)
{
- CPUState *env = opaque;
+ CPUXtensaState *env = opaque;
cpu_state_reset(env);
}
@@ -164,7 +164,7 @@ static void lx_init(const LxBoardDesc *board,
int be = 0;
#endif
MemoryRegion *system_memory = get_system_memory();
- CPUState *env = NULL;
+ CPUXtensaState *env = NULL;
MemoryRegion *ram, *rom, *system_io;
DriveInfo *dinfo;
pflash_t *flash = 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"
-void xtensa_advance_ccount(CPUState *env, uint32_t d)
+void xtensa_advance_ccount(CPUXtensaState *env, uint32_t d)
{
uint32_t old_ccount = env->sregs[CCOUNT];
@@ -45,7 +45,7 @@ void xtensa_advance_ccount(CPUState *env, uint32_t d)
}
}
-void check_interrupts(CPUState *env)
+void check_interrupts(CPUXtensaState *env)
{
int minlevel = xtensa_get_cintlevel(env);
uint32_t int_set_enabled = env->sregs[INTSET] & env->sregs[INTENABLE];
@@ -84,7 +84,7 @@ void check_interrupts(CPUState *env)
static void xtensa_set_irq(void *opaque, int irq, int active)
{
- CPUState *env = opaque;
+ CPUXtensaState *env = opaque;
if (irq >= 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, int
active)
}
}
-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);
}
-void xtensa_rearm_ccompare_timer(CPUState *env)
+void xtensa_rearm_ccompare_timer(CPUXtensaState *env)
{
int i;
uint32_t wake_ccount = env->sregs[CCOUNT] - 1;
@@ -125,7 +125,7 @@ void xtensa_rearm_ccompare_timer(CPUState *env)
static void xtensa_ccompare_cb(void *opaque)
{
- CPUState *env = opaque;
+ CPUXtensaState *env = opaque;
if (env->halted) {
env->halt_clock = qemu_get_clock_ns(vm_clock);
@@ -137,7 +137,7 @@ static void xtensa_ccompare_cb(void *opaque)
}
}
-void xtensa_irq_init(CPUState *env)
+void xtensa_irq_init(CPUXtensaState *env)
{
env->irq_inputs = (void **)qemu_allocate_irqs(
xtensa_set_irq, env, env->config->ninterrupt);
@@ -148,7 +148,7 @@ void xtensa_irq_init(CPUState *env)
}
}
-void *xtensa_get_extint(CPUState *env, unsigned extint)
+void *xtensa_get_extint(CPUXtensaState *env, unsigned extint)
{
if (extint < env->config->nextint) {
unsigned irq = 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 = NULL;
+ CPUXtensaState *env = NULL;
MemoryRegion *ram, *rom;
int n;
--
1.7.7
- [Qemu-devel] [PATCH v5 35/43] microblaze hw/: Don't use CPUState, (continued)
- [Qemu-devel] [PATCH v5 35/43] microblaze hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 37/43] ppc hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 38/43] s390x hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 40/43] sparc hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 43/43] qom: Introduce CPU class, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 32/43] i386 hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 34/43] m68k hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 23/43] target-sparc: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 36/43] mips hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 31/43] cris hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 41/43] xtensa hw/: Don't use CPUState,
Andreas Färber <=
- Re: [Qemu-devel] [PULL] QOM CPUState v5, Anthony Liguori, 2012/03/14
- [Qemu-devel] [PATCH v5 42/43] Rename CPUState -> CPUArchState, Andreas Färber, 2012/03/15