From 4bd7466166b8c1b612c7f01a124b24ab2a0ace14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 14 May 2012 04:21:52 +0200 Subject: arm_pic: Pass ARMCPU to arm_pic_init_cpu() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass it through to arm_pic_cpu_handler(). Signed-off-by: Andreas Färber Acked-by: Peter Maydell Acked-by: Igor Mitsyanko (for exynos) --- hw/highbank.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw/highbank.c') diff --git a/hw/highbank.c b/hw/highbank.c index a3901b08da..4bdea5df7d 100644 --- a/hw/highbank.c +++ b/hw/highbank.c @@ -192,7 +192,6 @@ static void highbank_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUARMState *env = NULL; DeviceState *dev; SysBusDevice *busdev; qemu_irq *irqp; @@ -215,10 +214,10 @@ static void highbank_init(ram_addr_t ram_size, fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - env = &cpu->env; + /* This will become a QOM property eventually */ cpu->reset_cbar = GIC_BASE_ADDR; - irqp = arm_pic_init_cpu(env); + irqp = arm_pic_init_cpu(cpu); cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ]; } -- cgit v1.2.1