aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Kovalenko <igor.v.kovalenko@gmail.com>2009-07-12 07:43:00 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-07-12 07:43:00 +0000
commit7d55273fcdc307399fc0e327a0c14c140cd439cf (patch)
tree489dccc4ec264cae42f3b230297443f90d6a74b8
parent536ba0157268494d641d0061bd9fa0c360d1dd78 (diff)
sparc64: really initialize irq
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
-rw-r--r--hw/sun4u.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 40f0c59354..dfe1578b67 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -450,7 +450,9 @@ static void sun4uv_init(ram_addr_t RAM_size,
}
}
}
- 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_vga_init(pci_bus, 0, 0);
@@ -481,7 +483,6 @@ static void sun4uv_init(ram_addr_t RAM_size,
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);