Message ID | 20231022155200.436340-19-dwmw2@infradead.org |
---|---|
State | New |
Headers | show |
Series | Rework matching of network devices to -nic options | expand |
On Mon, 23 Oct 2023 00:51:33 +0900, David Woodhouse wrote: > > 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.40.1 >
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");