From 5ae93306826fba021a86355e5d91253c67c736bc Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Wed, 14 Mar 2012 01:38:23 +0100 Subject: arm hw/: Don't use CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Anthony Liguori --- hw/xilinx_zynq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/xilinx_zynq.c') diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index ea13e8c844..7290c64a4c 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -50,7 +50,7 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *env = NULL; + CPUARMState *env = NULL; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ext_ram = g_new(MemoryRegion, 1); MemoryRegion *ocm_ram = g_new(MemoryRegion, 1); -- cgit 1.4.1