Преглед изворни кода

hw/hppa: use pci_init_nic_devices()

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
David Woodhouse пре 1 година
родитељ
комит
2dfe2f861b
1 измењених фајлова са 2 додато и 5 уклоњено
  1. 2 5
      hw/hppa/machine.c

+ 2 - 5
hw/hppa/machine.c

@@ -342,7 +342,6 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
     uint64_t kernel_entry = 0, kernel_low, kernel_high;
     uint64_t kernel_entry = 0, kernel_low, kernel_high;
     MemoryRegion *addr_space = get_system_memory();
     MemoryRegion *addr_space = get_system_memory();
     MemoryRegion *rom_region;
     MemoryRegion *rom_region;
-    long i;
     unsigned int smp_cpus = machine->smp.cpus;
     unsigned int smp_cpus = machine->smp.cpus;
     SysBusDevice *s;
     SysBusDevice *s;
 
 
@@ -368,10 +367,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
                         qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA));
                         qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA));
     }
     }
 
 
-    for (i = 0; i < nb_nics; i++) {
-        if (!enable_lasi_lan()) {
-            pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
-        }
+    if (!enable_lasi_lan()) {
+        pci_init_nic_devices(pci_bus, mc->default_nic);
     }
     }
 
 
     /* BMC board: HP Powerbar SP2 Diva (with console only) */
     /* BMC board: HP Powerbar SP2 Diva (with console only) */