ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sh4/r2d: use pci_init_nic_devices() 

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>
This commit is contained in:
David Woodhouse 2023-10-23 09:37:23 +01:00
parent 36b6968d34
commit 2d89ae0cbf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/sh4/r2d.c
View File

@ -240,7 +240,6 @@ static void r2d_init(MachineState *machine)
MemoryRegion *sdram = g_new(MemoryRegion, 1); MemoryRegion *sdram = g_new(MemoryRegion, 1);
qemu_irq *irq; qemu_irq *irq;
DriveInfo *dinfo; DriveInfo *dinfo;
int i;
DeviceState *dev; DeviceState *dev;
SysBusDevice *busdev; SysBusDevice *busdev;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
@ -309,9 +308,8 @@ static void r2d_init(MachineState *machine)
0x555, 0x2aa, 0); 0x555, 0x2aa, 0);
/* NIC: rtl8139 on-board, and 2 slots. */ /* NIC: rtl8139 on-board, and 2 slots. */
for (i = 0; i < nb_nics; i++) pci_init_nic_in_slot(pci_bus, mc->default_nic, NULL, "2");
pci_nic_init_nofail(&nd_table[i], pci_bus, pci_init_nic_devices(pci_bus, mc->default_nic);
mc->default_nic, i == 0 ? "2" : NULL);
/* USB keyboard */ /* USB keyboard */
usb_create_simple(usb_bus_find(-1), "usb-kbd"); usb_create_simple(usb_bus_find(-1), "usb-kbd");