ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/m68k/mcf5208: 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:44 +01:00
parent f52f3b342e
commit 6e32426f68
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/m68k/mcf5208.c
View File

@ -206,16 +206,16 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
} }
} }
static void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd, hwaddr base, static void mcf_fec_init(MemoryRegion *sysmem, hwaddr base, qemu_irq *irqs)
qemu_irq *irqs)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
int i; int i;
qemu_check_nic_model(nd, TYPE_MCF_FEC_NET); dev = qemu_create_nic_device(TYPE_MCF_FEC_NET, true, NULL);
dev = qdev_new(TYPE_MCF_FEC_NET); if (!dev) {
qdev_set_nic_properties(dev, nd); 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);
@ -267,14 +267,7 @@ static void mcf5208evb_init(MachineState *machine)
mcf5208_sys_init(address_space_mem, pic); mcf5208_sys_init(address_space_mem, pic);
if (nb_nics > 1) { mcf_fec_init(address_space_mem, 0xfc030000, pic + 36);
error_report("Too many NICs");
exit(1);
}
if (nd_table[0].used) {
mcf_fec_init(address_space_mem, &nd_table[0],
0xfc030000, pic + 36);
}
g_free(pic); g_free(pic);