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 | e2684c0b581f2742aa52edc8cd9be255032f9247 (patch) | |
| tree | eef40085cd59e1c9be4f2b12986a2bf6d77d0efa /hw/ppc4xx_devs.c | |
| parent | 61c56c8c862b8be9cb71faf74fcd990b3624aa41 (diff) | |
| download | qemu-e2684c0b581f2742aa52edc8cd9be255032f9247.zip qemu-e2684c0b581f2742aa52edc8cd9be255032f9247.tar.gz qemu-e2684c0b581f2742aa52edc8cd9be255032f9247.tar.bz2 | |
ppc hw/: Don't use CPUState
Scripted conversion:
for file in hw/ppc*.[hc] hw/mpc8544_guts.c hw/spapr*.[hc] hw/virtex_ml507.c hw/xics.c; do
sed -i "s/CPUState/CPUPPCState/g" $file
done
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ppc4xx_devs.c')
| -rw-r--r-- | hw/ppc4xx_devs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 2311162..00e36f4 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -40,18 +40,18 @@ static void ppc4xx_reset(void *opaque) { - CPUState *env = opaque; + CPUPPCState *env = opaque; cpu_state_reset(env); } /*****************************************************************************/ /* Generic PowerPC 4xx processor instantiation */ -CPUState *ppc4xx_init (const char *cpu_model, +CPUPPCState *ppc4xx_init (const char *cpu_model, clk_setup_t *cpu_clk, clk_setup_t *tb_clk, uint32_t sysclk) { - CPUState *env; + CPUPPCState *env; /* init CPUs */ env = cpu_init(cpu_model); @@ -295,7 +295,7 @@ static void ppcuic_reset (void *opaque) } } -qemu_irq *ppcuic_init (CPUState *env, qemu_irq *irqs, +qemu_irq *ppcuic_init (CPUPPCState *env, qemu_irq *irqs, uint32_t dcr_base, int has_ssr, int has_vr) { ppcuic_t *uic; @@ -641,7 +641,7 @@ static void sdram_reset (void *opaque) sdram->cfg = 0x00800000; } -void ppc4xx_sdram_init (CPUState *env, qemu_irq irq, int nbanks, +void ppc4xx_sdram_init (CPUPPCState *env, qemu_irq irq, int nbanks, MemoryRegion *ram_memories, target_phys_addr_t *ram_bases, target_phys_addr_t *ram_sizes, |