Include hw/irq.h a lot less

[qemu.git] / hw / unicore32 / puv3.c

diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index db26959a1d60edbec7434ca76b4dbcdb2160a30f..7e933de2281d2df8ed7fd3b8d1b07bc960c3aac1 100644 (file)
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -15,11 +15,12 @@
 #include "ui/console.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
-#include "hw/i386/pc.h"
 #include "sysemu/qtest.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"
+#include "hw/input/i8042.h"
+#include "hw/irq.h"
 
 #define KERNEL_LOAD_ADDR        0x03000000
 #define KERNEL_MAX_SIZE         0x00800000 /* Just a guess */
@@ -56,7 +57,7 @@ static void puv3_soc_init(CPUUniCore32State *env)
 
     /* Initialize interrupt controller */
     cpu_intc = qemu_allocate_irq(puv3_intc_cpu_handler,
-                                 uc32_env_get_cpu(env), 0);
+                                 env_archcpu(env), 0);
     dev = sysbus_create_simple("puv3_intc", PUV3_INTC_BASE, cpu_intc);
     for (i = 0; i < PUV3_IRQS_NR; i++) {
         irqs[i] = qdev_get_gpio_in(dev, i);