[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/46] hw/sh4/r2d: use pci_init_nic_devices()
From: |
David Woodhouse |
Subject: |
[PATCH v3 18/46] hw/sh4/r2d: use pci_init_nic_devices() |
Date: |
Mon, 8 Jan 2024 20:26:47 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Previously, the first PCI NIC would be assigned to slot 2 even if the
user override the model and made it something other than an rtl8139
which is the default. Everything else would be dynamically assigned.
Now, the first rtl8139 gets slot 2 and everything else is dynamic.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
hw/sh4/r2d.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 4944994e9c..e9f316a6ce 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -240,7 +240,6 @@ static void r2d_init(MachineState *machine)
MemoryRegion *sdram = g_new(MemoryRegion, 1);
qemu_irq *irq;
DriveInfo *dinfo;
- int i;
DeviceState *dev;
SysBusDevice *busdev;
MemoryRegion *address_space_mem = get_system_memory();
@@ -309,9 +308,8 @@ static void r2d_init(MachineState *machine)
0x555, 0x2aa, 0);
/* NIC: rtl8139 on-board, and 2 slots. */
- for (i = 0; i < nb_nics; i++)
- pci_nic_init_nofail(&nd_table[i], pci_bus,
- mc->default_nic, i == 0 ? "2" : NULL);
+ pci_init_nic_in_slot(pci_bus, mc->default_nic, NULL, "2");
+ pci_init_nic_devices(pci_bus, mc->default_nic);
/* USB keyboard */
usb_create_simple(usb_bus_find(-1), "usb-kbd");
--
2.41.0
- [PATCH v3 34/46] hw/microblaze: use qemu_configure_nic_device(), (continued)
- [PATCH v3 34/46] hw/microblaze: use qemu_configure_nic_device(), David Woodhouse, 2024/01/08
- [PATCH v3 30/46] hw/arm: use qemu_configure_nic_device(), David Woodhouse, 2024/01/08
- [PATCH v3 22/46] hw/arm/aspeed: use qemu_configure_nic_device(), David Woodhouse, 2024/01/08
- [PATCH v3 16/46] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2024/01/08
- [PATCH v3 14/46] hw/mips/loongson3_virt: use pci_init_nic_devices(), David Woodhouse, 2024/01/08
- [PATCH v3 21/46] hw/arm/allwinner: use qemu_configure_nic_device(), David Woodhouse, 2024/01/08
- [PATCH v3 18/46] hw/sh4/r2d: use pci_init_nic_devices(),
David Woodhouse <=
- [PATCH v3 32/46] hw/m68k/mcf5208: use qemu_create_nic_device(), David Woodhouse, 2024/01/08
- [PATCH v3 17/46] hw/ppc: use pci_init_nic_devices(), David Woodhouse, 2024/01/08
- [PATCH v3 11/46] hw/loongarch: use pci_init_nic_devices(), David Woodhouse, 2024/01/08
- [PATCH v3 02/46] net: report list of available models according to platform, David Woodhouse, 2024/01/08
- [PATCH v3 23/46] hw/arm/exynos4: use qemu_create_nic_device(), David Woodhouse, 2024/01/08