[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.3 v2 10/46] hw/hppa: use pci_init_nic_devices()
 
- To: qemu-devel@xxxxxxxxxx
 
- From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
 
- Date: Mon,  6 Nov 2023 19:49:15 +0000
 
- Cc: Richard Henderson <richard.henderson@xxxxxxxxxx>,	Beniamino Galvani <b.galvani@xxxxxxxxx>,	Peter Maydell <peter.maydell@xxxxxxxxxx>,	Strahinja Jankovic <strahinja.p.jankovic@xxxxxxxxx>,	Niek Linnenbank <nieklinnenbank@xxxxxxxxx>,	Cédric Le Goater <clg@xxxxxxxx>,	Andrew Jeffery <andrew@xxxxxxxxxxxxxxxxxxxx>,	Joel Stanley <joel@xxxxxxxxx>,	Igor Mitsyanko <i.mitsyanko@xxxxxxxxx>,	Jean-Christophe Dubois <jcd@xxxxxxxxxxxxxxx>,	Andrey Smirnov <andrew.smirnov@xxxxxxxxx>,	Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>,	Rob Herring <robh@xxxxxxxxxx>,	Subbaraya Sundeep <sundeep.lkml@xxxxxxxxx>,	Jan Kiszka <jan.kiszka@xxxxxx>,	Tyrone Ting <kfting@xxxxxxxxxxx>,	Hao Wu <wuhaotsh@xxxxxxxxxx>,	Radoslaw Biernacki <rad@xxxxxxxxxxxx>,	Leif Lindholm <quic_llindhol@xxxxxxxxxxx>,	Marcin Juszkiewicz <marcin.juszkiewicz@xxxxxxxxxx>,	"Edgar E. Iglesias" <edgar.iglesias@xxxxxxxxx>,	Alistair Francis <alistair@xxxxxxxxxxxxx>,	Helge Deller <deller@xxxxxx>,	"Michael S. Tsirkin" <mst@xxxxxxxxxx>,	Marcel Apfelbaum <marcel.apfelbaum@xxxxxxxxx>,	Paolo Bonzini <pbonzini@xxxxxxxxxx>,	Eduardo Habkost <eduardo@xxxxxxxxxxx>,	Song Gao <gaosong@xxxxxxxxxxx>,	Thomas Huth <huth@xxxxxxxxxxxxx>,	Laurent Vivier <laurent@xxxxxxxxx>,	Huacai Chen <chenhuacai@xxxxxxxxxx>,	Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>,	Hervé Poussineau <hpoussin@xxxxxxxxxxx>,	Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx>,	Aurelien Jarno <aurelien@xxxxxxxxxxx>,	Jason Wang <jasowang@xxxxxxxxxx>,	Jia Liu <proljc@xxxxxxxxx>,	Stafford Horne <shorne@xxxxxxxxx>,	Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>,	Nicholas Piggin <npiggin@xxxxxxxxx>,	Daniel Henrique Barboza <danielhb413@xxxxxxxxx>,	David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>,	Harsh Prateek Bora <harshpb@xxxxxxxxxxxxx>,	Bin Meng <bin.meng@xxxxxxxxxxxxx>,	Palmer Dabbelt <palmer@xxxxxxxxxxx>,	Weiwei Li <liweiwei@xxxxxxxxxxx>,	Liu Zhiwei <zhiwei_liu@xxxxxxxxxxxxxxxxx>,	David Hildenbrand <david@xxxxxxxxxx>,	Ilya Leoshkevich <iii@xxxxxxxxxxxxx>,	Halil Pasic <pasic@xxxxxxxxxxxxx>,	Christian Borntraeger <borntraeger@xxxxxxxxxxxxx>,	Eric Farman <farman@xxxxxxxxxxxxx>,	Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>,	Magnus Damm <magnus.damm@xxxxxxxxx>,	Artyom Tarasenko <atar4qemu@xxxxxxxxx>,	Stefano Stabellini <sstabellini@xxxxxxxxxx>,	Anthony Perard <anthony.perard@xxxxxxxxxx>,	Paul Durrant <paul@xxxxxxx>,	Max Filippov <jcmvbkbc@xxxxxxxxx>,	qemu-arm@xxxxxxxxxx,	qemu-ppc@xxxxxxxxxx,	qemu-riscv@xxxxxxxxxx,	qemu-s390x@xxxxxxxxxx,	xen-devel@xxxxxxxxxxxxxxxxxxxx
 
- Delivery-date: Mon, 06 Nov 2023 19:55:58 +0000
 
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
 
 
 
From: David Woodhouse <dwmw@xxxxxxxxxxxx>
Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx>
---
 hw/hppa/machine.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 67d4d1b5e0..d7cee6e49e 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -309,7 +309,6 @@ static void machine_HP_common_init_tail(MachineState 
*machine, PCIBus *pci_bus)
     uint64_t kernel_entry = 0, kernel_low, kernel_high;
     MemoryRegion *addr_space = get_system_memory();
     MemoryRegion *rom_region;
-    long i;
     unsigned int smp_cpus = machine->smp.cpus;
     SysBusDevice *s;
 
@@ -333,10 +332,8 @@ static void machine_HP_common_init_tail(MachineState 
*machine, PCIBus *pci_bus)
                         qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA));
     }
 
-    for (i = 0; i < nb_nics; i++) {
-        if (!enable_lasi_lan()) {
-            pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
-        }
+    if (!enable_lasi_lan()) {
+        pci_init_nic_devices(pci_bus, mc->default_nic);
     }
 
     /* BMC board: HP Powerbar SP2 Diva (with console only) */
-- 
2.41.0
 
    
     |