hw: Simplify calls to pci_nic_init_nofail()
PATCH 1/1 hw: Simplify calls to pci_nic_init_nofail()
pci_nic_init_nofail() calls qemu_find_nic_model(), and this function sets nd->model = g_strdup(default_model) if it has not been initialized yet. So we don't have to set nd->model to the default_nic in the calling sites.
--- hw/arm/sbsa-ref.c | 8 +------- hw/arm/virt.c | 8 +------- hw/loongarch/virt.c | 8 +------- hw/mips/loongson3_virt.c | 8 +------- hw/xtensa/virt.c | 8 +------- 5 files changed, 5 insertions(+), 35 deletions(-)
hw/arm/sbsa-ref.c +1 -7
@@ -683,13 +683,7 @@ static void create_pcie(SBSAMachineState *sms) pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } }
hw/arm/virt.c +1 -7
@@ -1477,13 +1477,7 @@ static void create_pcie(VirtMachineState *vms) vms->bus = pci->bus;if (vms->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } }
hw/loongarch/virt.c +1 -7
@@ -547,13 +547,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState */* Network init */ for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci_bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); }/*
hw/mips/loongson3_virt.c +1 -7
@@ -454,13 +454,7 @@ static inline void loongson3_virt_devices_init(MachineState *machine, }for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci_bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); } }
hw/xtensa/virt.c +1 -7
@@ -103,13 +103,7 @@ static void create_pcie(MachineState *ms, CPUXtensaState *env, int irq_base, pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } } }
Signature · 1 line
2.39.3
Hi Thomas,
Quoted 99 lines · Thomas Huth
pci_nic_init_nofail()callsqemu_find_nic_model(), and this function setsnd->model=g_strdup(default_model)if it has not been initialized yet. So we don't have to setnd->modelto thedefault_nicin the calling sites.Signed-off-by Thomas Huth <[email protected]>--- hw/arm/sbsa-ref.c | 8 +------- hw/arm/virt.c | 8 +------- hw/loongarch/virt.c | 8 +------- hw/mips/loongson3_virt.c | 8 +------- hw/xtensa/virt.c | 8 +------- 5 files changed, 5 insertions(+), 35 deletions(-)hw/arm/sbsa-ref.c +1
-7@@ -683,13 +683,7 @@ static void create_pcie(SBSAMachineState *sms) pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } }hw/arm/virt.c +1
-7@@ -1477,13 +1477,7 @@ static void create_pcie(VirtMachineState *vms) vms->bus = pci->bus;if (vms->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } }hw/loongarch/virt.c +1
-7@@ -547,13 +547,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState */* Network init */ for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci_bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); }/* hw/mips/loongson3_virt.c +1
-7@@ -454,13 +454,7 @@ static inline void loongson3_virt_devices_init(MachineState *machine, }for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci_bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); } }hw/xtensa/virt.c +0
-1@@ -103,13 +103,7 @@ static void create_pcie(MachineState *ms, CPUXtensaState *env, int irq_base, pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i];
hw/xtensa/virt.c static void create_pcie(MachineState *ms, CPUXtensaState *env, int irq_base, · line 109
Quoted 10 lines
hw/xtensa/virt.c +1
-6- -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } } }
This remind me of a branch from end of April with this unfinished patch, did we already discuss this together?
-- >8 --
include/hw/pci/pci.h +3 -0
@@ -317,6 +317,9 @@ void pci_device_reset(PCIDevice *dev);PCIDevice *pci_nic_init_nofail (NICInfo *nd,PCIBus *rootbus,const char *default_model,const char *default_devaddr); +PCIDevice *pci_nic_init_default (NICInfo *nd,PCIBus *rootbus, +const char *default_model, +const char *default_devaddr);PCIDevice *pci_vga_init (PCIBus *bus);
hw/alpha/dp264.c +1 -1
@@ -125,7 +125,7 @@ static void clipper_init(MachineState *machine)/* Network setup. e1000 is good enough, failing Tulip support. */ for (i =0 ; i < nb_nics; i++) { -pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); }/* Super I/O */
hw/arm/sbsa-ref.c +1 -7
@@ -638,13 +638,7 @@ static void create_pcie(SBSAMachineState *sms) pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup ("e1000e" ); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_default (nd, pci->bus,"e1000e" ,NULL ); } }
hw/arm/virt.c +1 -7
@@ -1477,13 +1477,7 @@ static void create_pcie(VirtMachineState *vms) vms->bus = pci->bus;if (vms->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_default (&nd_table[i], pci->bus, mc->default_nic,NULL ); } }
hw/hppa/machine.c +1 -1
@@ -273,7 +273,7 @@ static void machine_hppa_init(MachineState *machine)for (i =0 ; i < nb_nics; i++) {if (!enable_lasi_lan ()) { -pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); } }
hw/i386/pc.c +2 -4
@@ -1370,12 +1370,10 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)rom_set_order_override (FW_CFG_ORDER_OVERRIDE_NIC );for (i =0 ; i < nb_nics; i++) {NICInfo *nd = &nd_table[i]; -const char *model = nd->model ? nd->model : mc->default_nic; - -if (g_str_equal (model,"ne2k_isa" )) { +if (nd->model &&g_str_equal (nd->model,"ne2k_isa" )) {pc_init_ne2k_isa (isa_bus, nd); }else { -pci_nic_init_nofail (nd, pci_bus, model,NULL ); +pci_nic_init_default (nd, pci_bus, mc->default_nic,NULL ); } }rom_reset_order_override ();
hw/loongarch/virt.c +1 -7
@@ -526,13 +526,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState */* Network init */ for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci_bus, nd->model,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); }/*
hw/mips/loongson3_virt.c +1 -7
@@ -454,13 +454,7 @@ static inline void loongson3_virt_devices_init(MachineState *machine, }for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci_bus, nd->model,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); } }
hw/pci/pci.c +14 -0
@@ -1867,6 +1867,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,unsigned slot;if (nd->model && !strcmp (nd->model,"virtio" )) { +// DEPRECATE g_free (nd->model); nd->model =g_strdup ("virtio-net-pci" ); }
@@ -1923,6 +1924,19 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,return pci_dev; } +PCIDevice *pci_nic_init_nofail (NICInfo *nd,PCIBus *rootbus, +const char *default_model, +const char *default_devaddr); +PCIDevice *pci_nic_init_default (NICInfo *nd,PCIBus *rootbus, +const char *default_model, +const char *default_devaddr) +{ +if (!nd->model) { + nd->model =g_strdup (default_model); + } +return pci_nic_init_nofail (nd, rootbus, nd->model, default_devaddr); +} +PCIDevice *pci_vga_init (PCIBus *bus) { vga_interface_created = true;
hw/ppc/e500.c +1 -1
@@ -1074,7 +1074,7 @@ void ppce500_init(MachineState *machine)if (pci_bus) {/* Register network interfaces. */ for (i =0 ; i < nb_nics; i++) { -pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); } }
hw/ppc/mac_newworld.c +1 -1
@@ -445,7 +445,7 @@ static void ppc_core99_init(MachineState *machine) }for (i =0 ; i < nb_nics; i++) { -pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); }/* The NewWorld NVRAM is not located in the MacIO device */
hw/ppc/mac_oldworld.c +1 -1
@@ -277,7 +277,7 @@ static void ppc_heathrow_init(MachineState *machine)pci_vga_init (pci_bus);for (i =0 ; i < nb_nics; i++) { -pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic,NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic,NULL ); }/* MacIO IDE */
hw/ppc/ppc440_bamboo.c +1 -1
@@ -247,7 +247,7 @@ static void bamboo_init(MachineState *machine)* There are no PCI NICs on the Bamboo board, but there are * PCI slots, so we can pick whatever default model we want. */ -pci_nic_init_nofail (&nd_table[i], pcibus, mc->default_nic,NULL ); +pci_nic_init_default (&nd_table[i], pcibus, mc->default_nic,NULL ); } }
hw/ppc/prep.c +2 -2
@@ -324,8 +324,8 @@ static void ibm_40p_init(MachineState *machine)pci_vga_init (pci_bus);for (i =0 ; i < nb_nics; i++) { -pci_nic_init_nofail (&nd_table[i], pci_bus, mc->default_nic, - i ==0 ?"3" :NULL ); +pci_nic_init_default (&nd_table[i], pci_bus, mc->default_nic, + i ==0 ?"3" :NULL ); } }
hw/sh4/r2d.c +4 -3
@@ -309,9 +309,10 @@ 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 ); +for (i =0 ; i < nb_nics; i++) { +pci_nic_init_default (&nd_table[i], pci_bus, + mc->default_nic, i ==0 ?"2" :NULL ); + }/* USB keyboard */ usb_create_simple (usb_bus_find (-1 ),"usb-kbd" );
hw/xtensa/virt.c +1 -7
@@ -103,13 +103,7 @@ static void create_pcie(MachineState *ms, CPUXtensaState *env, int irq_base, pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) { -NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_default (&nd_table[i], pci->bus, mc->default_nic,NULL ); } } }
---
Quoted 16 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 13 lines · Thomas Huth
pci_nic_init_nofail()callsqemu_find_nic_model(), and this function setsnd->model=g_strdup(default_model)if it has not been initialized yet. So we don't have to setnd->modelto thedefault_nicin the calling sites.Signed-off-by Thomas Huth <[email protected]>---
hw/arm/sbsa-ref.c | 8 +-------
hw/arm/virt.c | 8 +-------
hw/loongarch/virt.c | 8 +-------
hw/mips/loongson3_virt.c| 8 +-------
hw/xtensa/virt.c | 8 +-------5 files changed, 5 insertions(+), 35 deletions(-)
...
Quoted 2 lines
This remind me of a branch from end of April with this unfinished patch, did we already discuss this together?
No, I haven't seen your patch yet, neither we talked about it. I came up with the idea for my patch on my own after looking at certain spots in the code. But I guess you could easily rebase your patch on top of mine in case you want to finish it ;-)
Thomas
Philippe Mathieu-Daudé
Reviewed-byQuoted 17 lines · Thomas Huth
Quoted 16 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 13 lines · Thomas Huth
pci_nic_init_nofail()callsqemu_find_nic_model(), and this function setsnd->model=g_strdup(default_model)if it has not been initialized yet. So we don't have to setnd->modelto thedefault_nicin the calling sites.Signed-off-by Thomas Huth <[email protected]>---
hw/arm/sbsa-ref.c | 8 +-------
hw/arm/virt.c | 8 +-------
hw/loongarch/virt.c | 8 +-------
hw/mips/loongson3_virt.c| 8 +-------
hw/xtensa/virt.c | 8 +-------5 files changed, 5 insertions(+), 35 deletions(-)
Quoted 5 lines
...
Quoted 2 lines
This remind me of a branch from end of April with this unfinished patch, did we already discuss this together?
No, I haven't seen your patch yet, neither we talked about it. I came up with the idea for my patch on my own after looking at certain spots in the code. But I guess you could easily rebase your patch on top of mine in case you want to finish it ;-)
Yeah sure, I was just wondering :)
Michael Tokarev
Applied29.06.2023 15:54, Thomas Huth пишет:
Quoted 22 lines
pci_nic_init_nofail()callsqemu_find_nic_model(), and this function setsnd->model=g_strdup(default_model)if it has not been initialized yet. So we don't have to setnd->modelto thedefault_nicin the calling sites.Signed-off-by Thomas Huth <[email protected]>--- hw/arm/sbsa-ref.c | 8 +------- hw/arm/virt.c | 8 +------- hw/loongarch/virt.c | 8 +------- hw/mips/loongson3_virt.c | 8 +------- hw/xtensa/virt.c | 8 +------- 5 files changed, 5 insertions(+), 35 deletions(-)hw/arm/sbsa-ref.c +0
-0@@ -683,13 +683,7 @@ static void create_pcie(SBSAMachineState *sms) pci =PCI_HOST_BRIDGE (dev);if (pci->bus) {for (i =0 ; i < nb_nics; i++) {
hw/arm/sbsa-ref.c static void create_pcie(SBSAMachineState *sms) · line 688
Quoted 10 lines
hw/arm/sbsa-ref.c +1
-7-NICInfo *nd = &nd_table[i]; - -if (!nd->model) { - nd->model =g_strdup (mc->default_nic); - } - -pci_nic_init_nofail (nd, pci->bus, nd->model,NULL ); +pci_nic_init_nofail (&nd_table[i], pci->bus, mc->default_nic,NULL ); } }
What a wonderful copy-spagetti it was :)
Applied to my trivial-patches branch, thank you!
/mjt