| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
 [PATCH for-8.3 v2 34/46] hw/microblaze: use qemu_configure_nic_device()
 
To: qemu-devel@xxxxxxxxxxFrom: David Woodhouse <dwmw2@xxxxxxxxxxxxx>Date: Mon,  6 Nov 2023 19:49:39 +0000Cc: 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@xxxxxxxxxxxxxxxxxxxxDelivery-date: Mon, 06 Nov 2023 19:55:44 +0000List-id: Xen developer discussion <xen-devel.lists.xenproject.org> 
 From: David Woodhouse <dwmw@xxxxxxxxxxxx>
Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx>
---
 hw/microblaze/petalogix_ml605_mmu.c      | 3 +--
 hw/microblaze/petalogix_s3adsp1800_mmu.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c 
b/hw/microblaze/petalogix_ml605_mmu.c
index fb7889cf67..0f5fabc32e 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -133,7 +133,6 @@ petalogix_ml605_init(MachineState *machine)
     sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
 
     /* axi ethernet and dma initialization. */
-    qemu_check_nic_model(&nd_table[0], "xlnx.axi-ethernet");
     eth0 = qdev_new("xlnx.axi-ethernet");
     dma = qdev_new("xlnx.axi-dma");
 
@@ -145,7 +144,7 @@ petalogix_ml605_init(MachineState *machine)
                                   "axistream-connected-target", NULL);
     cs = object_property_get_link(OBJECT(dma),
                                   "axistream-control-connected-target", NULL);
-    qdev_set_nic_properties(eth0, &nd_table[0]);
+    qemu_configure_nic_device(eth0, true, NULL);
     qdev_prop_set_uint32(eth0, "rxmem", 0x1000);
     qdev_prop_set_uint32(eth0, "txmem", 0x1000);
     object_property_set_link(OBJECT(eth0), "axistream-connected", ds,
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c 
b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 505639c298..dad46bd7f9 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -114,9 +114,8 @@ petalogix_s3adsp1800_init(MachineState *machine)
     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR);
     sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
 
-    qemu_check_nic_model(&nd_table[0], "xlnx.xps-ethernetlite");
     dev = qdev_new("xlnx.xps-ethernetlite");
-    qdev_set_nic_properties(dev, &nd_table[0]);
+    qemu_configure_nic_device(dev, true, NULL);
     qdev_prop_set_uint32(dev, "tx-ping-pong", 0);
     qdev_prop_set_uint32(dev, "rx-ping-pong", 0);
     sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
-- 
2.41.0
 |