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 | 5ae93306826fba021a86355e5d91253c67c736bc (patch) | |
| tree | 66d83611257babf969c48a20c0fdf737a374f770 /hw/armv7m.c | |
| parent | 8b2aee2959c34ef7319067010bb517103144ac6b (diff) | |
| download | qemu-5ae93306826fba021a86355e5d91253c67c736bc.tar.gz | |
arm hw/: Don't use CPUState
Scripted conversion:
for file in hw/arm-misc.h hw/arm_boot.c hw/arm_pic.c hw/armv7m.c hw/exynos4210.h hw/highbank.c hw/integratorcp.c hw/musicpal.c hw/omap.h hw/pxa.h hw/pxa2xx_gpio.c hw/pxa2xx_pic.c hw/realview.c hw/strongarm.h hw/versatilepb.c hw/vexpress.c hw/xilinx_zynq.c ; do
sed -i "s/CPUState/CPUARMState/g" $file
done
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/armv7m.c')
| -rw-r--r-- | hw/armv7m.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/armv7m.c b/hw/armv7m.c index 9cf96f412b..4aac076e48 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -149,7 +149,7 @@ static void armv7m_bitband_init(void) static void armv7m_reset(void *opaque) { - cpu_state_reset((CPUState *)opaque); + cpu_state_reset((CPUARMState *)opaque); } /* Init CPU and memory for a v7-M based board. @@ -160,7 +160,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model) { - CPUState *env; + CPUARMState *env; DeviceState *nvic; /* FIXME: make this local state. */ static qemu_irq pic[64]; |