[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/47] hw/sh4/r2d: use pci_init_nic_devices()
From: |
David Woodhouse |
Subject: |
[PULL 18/47] hw/sh4/r2d: use pci_init_nic_devices() |
Date: |
Thu, 1 Feb 2024 16:43:43 +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.43.0
- [PULL 23/47] hw/arm/exynos4: use qemu_create_nic_device(), (continued)
- [PULL 23/47] hw/arm/exynos4: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 39/47] hw/openrisc/openrisc_sim: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 40/47] hw/riscv: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 19/47] hw/sparc64/sun4u: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 35/47] hw/mips/mipssim: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 26/47] hw/net/lan9118: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 20/47] hw/xtensa/virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 15/47] hw/ppc/prep: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs, David Woodhouse, 2024/02/01
- [PULL 18/47] hw/sh4/r2d: use pci_init_nic_devices(),
David Woodhouse <=
- [PULL 03/47] net: add qemu_create_nic_bus_devices(), David Woodhouse, 2024/02/01
- [PULL 13/47] hw/mips/malta: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 22/47] hw/arm/aspeed: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases, David Woodhouse, 2024/02/01
- [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model(), David Woodhouse, 2024/02/01
- [PULL 37/47] hw/net/lasi_i82596: Re-enable build, David Woodhouse, 2024/02/01
- [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 17/47] hw/ppc: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info(), David Woodhouse, 2024/02/01