From 43824588af2fa77f9586e16ef2f01d1990c6460e Mon Sep 17 00:00:00 2001
From: Andreas Färber <afaerber@suse.de>
Date: Thu, 3 May 2012 23:47:04 +0200
Subject: pxa2xx: Use cpu_arm_init() and store ARMCPU
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/pxa.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hw/pxa.h')

diff --git a/hw/pxa.h b/hw/pxa.h
index 025be34f86..2be006d29c 100644
--- a/hw/pxa.h
+++ b/hw/pxa.h
@@ -122,7 +122,7 @@ typedef struct PXA2xxI2SState PXA2xxI2SState;
 typedef struct PXA2xxFIrState PXA2xxFIrState;
 
 typedef struct {
-    CPUARMState *env;
+    ARMCPU *cpu;
     DeviceState *pic;
     qemu_irq reset;
     MemoryRegion sdram;
-- 
cgit v1.2.3