[Qemu-devel] [PATCH] sparc64: really initialize irq

[Igor Kovalenko <igor.v.kovalenko@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

Allocate irq just before passing it to pci bridge initialization
and actually use it to initialize pci bridge.

Signed-off-by: igor.v.kovalenko@gmail.com

-- 
Kind regards,
Igor V. Kovalenko

[-- Attachment #2: sparc64-initialize-irq --]
[-- Type: application/octet-stream, Size: 902 bytes --]

Index: qemu-trunk/hw/sun4u.c
===================================================================
--- qemu-trunk.orig/hw/sun4u.c
+++ qemu-trunk/hw/sun4u.c
@@ -450,7 +450,9 @@ static void sun4uv_init(ram_addr_t RAM_s
             }
         }
     }
-    pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL, &pci_bus2,
+
+    irq = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS);
+    pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, irq, &pci_bus2,
                            &pci_bus3);
     isa_mem_base = VGA_BASE;
     pci_mem_base = APB_MEM_BASE;
@@ -482,7 +484,6 @@ static void sun4uv_init(ram_addr_t RAM_s
     for(i = 0; i < nb_nics; i++)
         pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
 
-    irq = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS);
     if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
         fprintf(stderr, "qemu: too many IDE bus\n");
         exit(1);