summaryrefslogtreecommitdiffstats
path: root/hw/pxa2xx_pic.c
diff options
context:
space:
mode:
authorAndreas Färber2012-05-04 00:01:27 +0200
committerAndreas Färber2012-06-11 00:23:04 +0200
commitf161bcd05fca4902ce680a37314b49586b5a8b2e (patch)
treea4d0f80d30c7f9c9ee741d75e6f4f6a4b379cce1 /hw/pxa2xx_pic.c
parentexynos4210: Use cpu_arm_init() to store ARMCPU (diff)
downloadqemu-f161bcd05fca4902ce680a37314b49586b5a8b2e.tar.gz
qemu-f161bcd05fca4902ce680a37314b49586b5a8b2e.tar.xz
qemu-f161bcd05fca4902ce680a37314b49586b5a8b2e.zip
pxa2xx: Pass ARMCPU to pxa2xx_pic_init()
Cleans up after storing ARMCPU in PXA2xxState. Prepares for storing ARMCPU in PXA2xxPICState. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pxa2xx_pic.c')
-rw-r--r--hw/pxa2xx_pic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pxa2xx_pic.c b/hw/pxa2xx_pic.c
index a806b80b0f..255cc3fd9f 100644
--- a/hw/pxa2xx_pic.c
+++ b/hw/pxa2xx_pic.c
@@ -245,8 +245,9 @@ static int pxa2xx_pic_post_load(void *opaque, int version_id)
return 0;
}
-DeviceState *pxa2xx_pic_init(target_phys_addr_t base, CPUARMState *env)
+DeviceState *pxa2xx_pic_init(target_phys_addr_t base, ARMCPU *cpu)
{
+ CPUARMState *env = &cpu->env;
DeviceState *dev = qdev_create(NULL, "pxa2xx_pic");
PXA2xxPICState *s = FROM_SYSBUS(PXA2xxPICState, sysbus_from_qdev(dev));