Commit 7d55273fcdc307399fc0e327a0c14c140cd439cf
Committed by
Blue Swirl
Blue Swirl
1 parent
536ba015
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
Showing
1 changed file
with
3 additions
and
2 deletions
hw/sun4u.c
| @@ -450,7 +450,9 @@ static void sun4uv_init(ram_addr_t RAM_size, | @@ -450,7 +450,9 @@ static void sun4uv_init(ram_addr_t RAM_size, | ||
| 450 | } | 450 | } |
| 451 | } | 451 | } |
| 452 | } | 452 | } |
| 453 | - pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL, &pci_bus2, | 453 | + |
| 454 | + irq = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); | ||
| 455 | + pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, irq, &pci_bus2, | ||
| 454 | &pci_bus3); | 456 | &pci_bus3); |
| 455 | isa_mem_base = VGA_BASE; | 457 | isa_mem_base = VGA_BASE; |
| 456 | pci_vga_init(pci_bus, 0, 0); | 458 | pci_vga_init(pci_bus, 0, 0); |
| @@ -481,7 +483,6 @@ static void sun4uv_init(ram_addr_t RAM_size, | @@ -481,7 +483,6 @@ static void sun4uv_init(ram_addr_t RAM_size, | ||
| 481 | for(i = 0; i < nb_nics; i++) | 483 | for(i = 0; i < nb_nics; i++) |
| 482 | pci_nic_init(&nd_table[i], "ne2k_pci", NULL); | 484 | pci_nic_init(&nd_table[i], "ne2k_pci", NULL); |
| 483 | 485 | ||
| 484 | - irq = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); | ||
| 485 | if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { | 486 | if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { |
| 486 | fprintf(stderr, "qemu: too many IDE bus\n"); | 487 | fprintf(stderr, "qemu: too many IDE bus\n"); |
| 487 | exit(1); | 488 | exit(1); |