mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips/fuloong2e: use pci_init_nic_devices()

Browse Source 
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>
This commit is contained in:
David Woodhouse 2023-10-21 21:26:19 +01:00
parent 13af77ee50
commit 8e4375618b
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/mips/fuloong2e.c
View File

@ -201,19 +201,9 @@ static void main_cpu_reset(void *opaque)
/* Network support */ /* Network support */
static void network_init(PCIBus *pci_bus) 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 */ /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
default_devaddr = "07"; pci_init_nic_in_slot(pci_bus, "rtl8139", NULL, "07");
} pci_init_nic_devices(pci_bus, "rtl8139");
pci_nic_init_nofail(nd, pci_bus, "rtl8139", default_devaddr);
}
} }
static void mips_fuloong2e_init(MachineState *machine) static void mips_fuloong2e_init(MachineState *machine)