diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-03-14 01:38:23 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-03-14 22:20:26 +0100 |
| commit | 61c56c8c862b8be9cb71faf74fcd990b3624aa41 (patch) | |
| tree | 6ee0ae11759d22f26d80a38b7f03166ce3d46f3c /hw/mips_malta.c | |
| parent | ee118507324a597cacef3972fd69ac387c28744e (diff) | |
| download | qemu-61c56c8c862b8be9cb71faf74fcd990b3624aa41.zip qemu-61c56c8c862b8be9cb71faf74fcd990b3624aa41.tar.gz qemu-61c56c8c862b8be9cb71faf74fcd990b3624aa41.tar.bz2 | |
mips hw/: Don't use CPUState
Scripted conversion:
for file in hw/mips_*.[hc]; do
sed -i "s/CPUState/CPUMIPSState/g" $file
done
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 3335e11..5e26775 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -500,7 +500,7 @@ static void network_init(void) a3 - RAM size in bytes */ -static void write_bootloader (CPUState *env, uint8_t *base, +static void write_bootloader (CPUMIPSState *env, uint8_t *base, int64_t kernel_entry) { uint32_t *p; @@ -736,7 +736,7 @@ static int64_t load_kernel (void) return kernel_entry; } -static void malta_mips_config(CPUState *env) +static void malta_mips_config(CPUMIPSState *env) { env->mvp->CP0_MVPConf0 |= ((smp_cpus - 1) << CP0MVPC0_PVPE) | ((smp_cpus * env->nr_threads - 1) << CP0MVPC0_PTC); @@ -744,7 +744,7 @@ static void malta_mips_config(CPUState *env) static void main_cpu_reset(void *opaque) { - CPUState *env = opaque; + CPUMIPSState *env = opaque; cpu_state_reset(env); /* The bootloader does not need to be rewritten as it is located in a @@ -759,7 +759,7 @@ static void main_cpu_reset(void *opaque) static void cpu_request_exit(void *opaque, int irq, int level) { - CPUState *env = cpu_single_env; + CPUMIPSState *env = cpu_single_env; if (env && level) { cpu_exit(env); @@ -781,7 +781,7 @@ void mips_malta_init (ram_addr_t ram_size, int64_t kernel_entry; PCIBus *pci_bus; ISABus *isa_bus; - CPUState *env; + CPUMIPSState *env; qemu_irq *isa_irq; qemu_irq *cpu_exit_irq; int piix4_devfn; |