diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2023-10-21 21:30:51 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2024-02-02 16:23:47 +0000 |
| commit | 761884013ebdb6a117b3aa98bce6bea1078c5377 (patch) | |
| tree | 6f0634e894a8c71d2426f87214ed6a9c5bea0fa8 /hw/mips | |
| parent | 8e4375618b0870a653e2d7fc4e6f6589bea13bb2 (diff) | |
| download | qemu-761884013ebdb6a117b3aa98bce6bea1078c5377.zip qemu-761884013ebdb6a117b3aa98bce6bea1078c5377.tar.gz qemu-761884013ebdb6a117b3aa98bce6bea1078c5377.tar.bz2 | |
hw/mips/malta: use pci_init_nic_devices()
The Malta board setup code would previously place the first NIC into PCI
slot 11 if was a PCNet card, and the rest (including the first if it was
anything other than a PCNet card) would be dynamically assigned.
Now it will place any PCNet NIC into slot 11, and then anything else will
be dynamically assigned.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/mips')
| -rw-r--r-- | hw/mips/malta.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/hw/mips/malta.c b/hw/mips/malta.c index d22bb1e..af74008 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -612,18 +612,9 @@ static MaltaFPGAState *malta_fpga_init(MemoryRegion *address_space, /* Network support */ static void network_init(PCIBus *pci_bus) { - int i; - - for (i = 0; i < nb_nics; i++) { - NICInfo *nd = &nd_table[i]; - const char *default_devaddr = NULL; - - if (i == 0 && (!nd->model || strcmp(nd->model, "pcnet") == 0)) - /* The malta board has a PCNet card using PCI SLOT 11 */ - default_devaddr = "0b"; - - pci_nic_init_nofail(nd, pci_bus, "pcnet", default_devaddr); - } + /* The malta board has a PCNet card using PCI SLOT 11 */ + pci_init_nic_in_slot(pci_bus, "pcnet", NULL, "0b"); + pci_init_nic_devices(pci_bus, "pcnet"); } static void bl_setup_gt64120_jump_kernel(void **p, uint64_t run_addr, |