Skip to content

Commit

Permalink
hw/m68k/mcf5208: use qemu_create_nic_device()
Browse files Browse the repository at this point in the history
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
dwmw2 committed Feb 1, 2024
1 parent 317707a commit ad656de
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions hw/m68k/mcf5208.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
qemu_irq *irqs)
static void mcf_fec_init(MemoryRegion *sysmem, hwaddr base, qemu_irq *irqs)
{
DeviceState *dev;
SysBusDevice *s;
int i;

qemu_check_nic_model(nd, TYPE_MCF_FEC_NET);
dev = qdev_new(TYPE_MCF_FEC_NET);
qdev_set_nic_properties(dev, nd);
dev = qemu_create_nic_device(TYPE_MCF_FEC_NET, true, NULL);
if (!dev) {
return;
}

s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
Expand Down Expand Up @@ -267,14 +267,7 @@ static void mcf5208evb_init(MachineState *machine)

mcf5208_sys_init(address_space_mem, pic);

if (nb_nics > 1) {
error_report("Too many NICs");
exit(1);
}
if (nd_table[0].used) {
mcf_fec_init(address_space_mem, &nd_table[0],
0xfc030000, pic + 36);
}
mcf_fec_init(address_space_mem, 0xfc030000, pic + 36);

g_free(pic);

Expand Down

0 comments on commit ad656de

Please sign in to comment.