motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices()

Browse source 
Avoid directly referencing nd_table[] by first instantiating any
spapr-vlan devices using a qemu_get_nic_info() loop, then calling
pci_init_nic_devices() to do the rest.

No functional change intended.

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-23 09:37:17 +01:00
parent 4c71721651
commit 0aff81618b
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/ppc/spapr.c
View file

@ -2796,6 +2796,7 @@ static void spapr_machine_init(MachineState *machine)
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
long load_limit, fw_size; long load_limit, fw_size;
Error *resize_hpt_err = NULL; Error *resize_hpt_err = NULL;
NICInfo *nd;
if (!filename) { if (!filename) {
error_report("Could not find LPAR firmware '%s'", bios_name); error_report("Could not find LPAR firmware '%s'", bios_name);
@ -2996,21 +2997,12 @@ static void spapr_machine_init(MachineState *machine)
phb = spapr_create_default_phb(); phb = spapr_create_default_phb();
for (i = 0; i < nb_nics; i++) { while ((nd = qemu_find_nic_info("spapr-vlan", true, "ibmveth"))) {
NICInfo *nd = &nd_table[i];
if (!nd->model) {
nd->model = g_strdup("spapr-vlan");
}
if (g_str_equal(nd->model, "spapr-vlan") ||
g_str_equal(nd->model, "ibmveth")) {
spapr_vlan_create(spapr->vio_bus, nd); spapr_vlan_create(spapr->vio_bus, nd);
} else {
pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL);
}
} }
pci_init_nic_devices(phb->bus, NULL);
for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) { for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) {
spapr_vscsi_create(spapr->vio_bus); spapr_vscsi_create(spapr->vio_bus);
} }