[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/47] hw/mips/fuloong2e: use pci_init_nic_devices()
From: |
David Woodhouse |
Subject: |
[PULL 12/47] hw/mips/fuloong2e: use pci_init_nic_devices() |
Date: |
Thu, 1 Feb 2024 16:43:37 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
The previous behaviour was: *if* the first NIC specified on the command
line was an RTL8139 (or unspecified model) then it gets assigned to PCI
slot 7, which is where the Fuloong board had an RTL8139. All other
devices (including the first, if it was specified as anything other than
an rtl8319) get dynamically assigned on the bus.
The new behaviour is subtly different: If the first NIC was given a
specific model *other* than rtl8139, and a subsequent NIC was not,
then the rtl8139 (or unspecified) NIC will go to slot 7 and the rest
will be dynamically assigned.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/mips/fuloong2e.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 97b2c8ed8e..a45aac368c 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -201,19 +201,9 @@ static void main_cpu_reset(void *opaque)
/* 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, "rtl8139") == 0)) {
- /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
- default_devaddr = "07";
- }
-
- pci_nic_init_nofail(nd, pci_bus, "rtl8139", default_devaddr);
- }
+ /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
+ pci_init_nic_in_slot(pci_bus, "rtl8139", NULL, "07");
+ pci_init_nic_devices(pci_bus, "rtl8139");
}
static void mips_fuloong2e_init(MachineState *machine)
--
2.43.0
- [PULL 09/47] hw/arm/virt: use pci_init_nic_devices(), (continued)
- [PULL 09/47] hw/arm/virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 14/47] hw/mips/loongson3_virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), David Woodhouse, 2024/02/01
- [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 29/47] hw/arm/stellaris: use qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 34/47] hw/microblaze: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 10/47] hw/hppa: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 47/47] net: make nb_nics and nd_table[] static in net/net.c, David Woodhouse, 2024/02/01
- [PULL 11/47] hw/loongarch: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 12/47] hw/mips/fuloong2e: use pci_init_nic_devices(),
David Woodhouse <=
- [PULL 05/47] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 41/47] hw/s390x/s390-virtio-ccw: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 31/47] hw/net/etraxfs-eth: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 32/47] hw/m68k/mcf5208: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 30/47] hw/arm: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 08/47] hw/arm/sbsa-ref: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 27/47] hw/arm/highbank: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 42/47] hw/sparc/sun4m: use qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 33/47] hw/m68k/q800: use qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 16/47] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2024/02/01