[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/27] pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 19/27] pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo |
Date: |
Mon, 11 Jun 2012 02:00:51 +0200 |
Prepares for moving halted field into CPUState.
Add missing braces.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Peter Maydell <address@hidden>
---
hw/pxa2xx_gpio.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/pxa2xx_gpio.c b/hw/pxa2xx_gpio.c
index 09a408b..3c90c9c 100644
--- a/hw/pxa2xx_gpio.c
+++ b/hw/pxa2xx_gpio.c
@@ -20,7 +20,7 @@ struct PXA2xxGPIOInfo {
qemu_irq irq0, irq1, irqX;
int lines;
int ncpu;
- CPUARMState *cpu_env;
+ ARMCPU *cpu;
/* XXX: GNU C vectors are more suitable */
uint32_t ilevel[PXA2XX_GPIO_BANKS];
@@ -118,8 +118,9 @@ static void pxa2xx_gpio_set(void *opaque, int line, int
level)
pxa2xx_gpio_irq_update(s);
/* Wake-up GPIOs */
- if (s->cpu_env->halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank]))
- cpu_interrupt(s->cpu_env, CPU_INTERRUPT_EXITTB);
+ if (s->cpu->env.halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank]))
{
+ cpu_interrupt(&s->cpu->env, CPU_INTERRUPT_EXITTB);
+ }
}
static void pxa2xx_gpio_handler_update(PXA2xxGPIOInfo *s) {
@@ -275,7 +276,7 @@ static int pxa2xx_gpio_initfn(SysBusDevice *dev)
s = FROM_SYSBUS(PXA2xxGPIOInfo, dev);
- s->cpu_env = qemu_get_cpu(s->ncpu);
+ s->cpu = arm_env_get_cpu(qemu_get_cpu(s->ncpu));
qdev_init_gpio_in(&dev->qdev, pxa2xx_gpio_set, s->lines);
qdev_init_gpio_out(&dev->qdev, s->handler, s->lines);
--
1.7.7
- [Qemu-devel] [PATCH 09/27] integratorcp: Use cpu_arm_init() to obtain ARMCPU, (continued)
- [Qemu-devel] [PATCH 09/27] integratorcp: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 15/27] vexpress: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 14/27] realview: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 11/27] versatilepb: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 10/27] musicpal: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 08/27] strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 21/27] arm_boot: Pass ARMCPU to arm_load_kernel(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 16/27] exynos4210: Use cpu_arm_init() to store ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 12/27] arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 18/27] pxa2xx_pic: Store ARMCPU in PXA2xxPICState, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 19/27] pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo,
Andreas Färber <=
- [Qemu-devel] [PATCH 20/27] xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 17/27] pxa2xx: Pass ARMCPU to pxa2xx_pic_init(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 13/27] arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 23/27] xen_machine_pv: Use cpu_x86_init() to obtain X86CPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 25/27] s390-virtio: Use cpu_s390x_init() to obtain S390CPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 22/27] arm_pic: Pass ARMCPU to arm_pic_init_cpu(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 24/27] target-s390x: Let cpu_s390x_init() return S390CPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 26/27] s390-virtio: Let s390_cpu_addr2state() return S390CPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 27/27] target-s390x: Pass S390CPU to s390_cpu_restart(), Andreas Färber, 2012/06/10
- Re: [Qemu-devel] [PULL] QOM CPUState, part 3a: cleanups & preparations, Anthony Liguori, 2012/06/11