diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-14 04:21:52 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:04 +0200 |
| commit | 4bd7466166b8c1b612c7f01a124b24ab2a0ace14 (patch) | |
| tree | 75891417cf185f4ea58b7d60d3e5ebccb33c9e86 /hw/highbank.c | |
| parent | 3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a (diff) | |
| download | qemu-4bd7466166b8c1b612c7f01a124b24ab2a0ace14.zip qemu-4bd7466166b8c1b612c7f01a124b24ab2a0ace14.tar.gz qemu-4bd7466166b8c1b612c7f01a124b24ab2a0ace14.tar.bz2 | |
arm_pic: Pass ARMCPU to arm_pic_init_cpu()
Pass it through to arm_pic_cpu_handler().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
Diffstat (limited to 'hw/highbank.c')
| -rw-r--r-- | hw/highbank.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/highbank.c b/hw/highbank.c index a3901b0..4bdea5d 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]; } |