proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-08 14:21:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xtensa hw/: Don't use CPUState

Browse Source 
Scripted conversion:
  for file in hw/xtensa_*.[hc]; do
    sed -i "s/CPUState/CPUXtensaState/g" $file
  done

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2012-03-14 01:38:24 +01:00
parent 98cec4a2e6
commit 5bfcb36ec4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xtensa_lx60.c
View File

@ -148,7 +148,7 @@ static uint64_t translate_phys_addr(void *env, uint64_t addr)
static void lx60_reset(void *opaque) static void lx60_reset(void *opaque)
{ {
CPUState *env = opaque; CPUXtensaState *env = opaque;
cpu_state_reset(env); cpu_state_reset(env);
} }
@ -164,7 +164,7 @@ static void lx_init(const LxBoardDesc *board,
int be = 0; int be = 0;
#endif #endif
MemoryRegion *system_memory = get_system_memory(); MemoryRegion *system_memory = get_system_memory();
CPUState *env = NULL; CPUXtensaState *env = NULL;
MemoryRegion *ram, *rom, *system_io; MemoryRegion *ram, *rom, *system_io;
DriveInfo *dinfo; DriveInfo *dinfo;
pflash_t *flash = NULL; pflash_t *flash = NULL;

16
hw/xtensa_pic.c
View File

@ -29,7 +29,7 @@
#include "qemu-log.h" #include "qemu-log.h"
#include "qemu-timer.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]; 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); int minlevel = xtensa_get_cintlevel(env);
uint32_t int_set_enabled = env->sregs[INTSET] & env->sregs[INTENABLE]; 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) static void xtensa_set_irq(void *opaque, int irq, int active)
{ {
CPUState *env = opaque; CPUXtensaState *env = opaque;
if (irq >= env->config->ninterrupt) { if (irq >= env->config->ninterrupt) {
qemu_log("%s: bad IRQ %d\n", __func__, irq); 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); 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; int i;
uint32_t wake_ccount = env->sregs[CCOUNT] - 1; 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) static void xtensa_ccompare_cb(void *opaque)
{ {
CPUState *env = opaque; CPUXtensaState *env = opaque;
if (env->halted) { if (env->halted) {
env->halt_clock = qemu_get_clock_ns(vm_clock); 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( env->irq_inputs = (void **)qemu_allocate_irqs(
xtensa_set_irq, env, env->config->ninterrupt); 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) { if (extint < env->config->nextint) {
unsigned irq = env->config->extint[extint]; unsigned irq = env->config->extint[extint];

2
hw/xtensa_sim.c
View File

@ -47,7 +47,7 @@ static void sim_init(ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
CPUState *env = NULL; CPUXtensaState *env = NULL;
MemoryRegion *ram, *rom; MemoryRegion *ram, *rom;
int n; int n;