| Message ID | 20240108204909.564514-35-dwmw2@infradead.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Rework matching of network devices to -nic options | expand |
On 08/01/2024 21.27, David Woodhouse wrote: > From: David Woodhouse <dwmw@amazon.co.uk> > > Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> > --- > 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); Reviewed-by: Thomas Huth <thuth@redhat.com>
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);