hw/xtensa/xtfpga: use qemu_create_nic_device()

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:56 +01:00
parent ae0b175b23
commit 7db00af636

View File

@ -141,14 +141,16 @@ static void xtfpga_net_init(MemoryRegion *address_space,
hwaddr base, hwaddr base,
hwaddr descriptors, hwaddr descriptors,
hwaddr buffers, hwaddr buffers,
qemu_irq irq, NICInfo *nd) qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
MemoryRegion *ram; MemoryRegion *ram;
dev = qdev_new("open_eth"); dev = qemu_create_nic_device("open_eth", true, NULL);
qdev_set_nic_properties(dev, nd); if (!dev) {
return;
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -301,10 +303,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
memory_region_add_subregion(system_memory, board->io[1], io); memory_region_add_subregion(system_memory, board->io[1], io);
} }
xtfpga_fpga_init(system_io, 0x0d020000, freq); xtfpga_fpga_init(system_io, 0x0d020000, freq);
if (nd_table[0].used) { xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000, extints[1]);
xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000,
extints[1], nd_table);
}
serial_mm_init(system_io, 0x0d050020, 2, extints[0], serial_mm_init(system_io, 0x0d050020, 2, extints[0],
115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);