hw/arm/aspeed: use qemu_configure_nic_device()

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Acked-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
David Woodhouse 2023-10-23 09:37:30 +01:00
parent 7e9c15ace6
commit b3cfec5bc9

View file

@ -356,7 +356,6 @@ static void aspeed_machine_init(MachineState *machine)
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine); AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
AspeedSoCClass *sc; AspeedSoCClass *sc;
int i; int i;
NICInfo *nd = &nd_table[0];
bmc->soc = ASPEED_SOC(object_new(amc->soc_name)); bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc)); object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
@ -371,10 +370,10 @@ static void aspeed_machine_init(MachineState *machine)
&error_fatal); &error_fatal);
for (i = 0; i < sc->macs_num; i++) { for (i = 0; i < sc->macs_num; i++) {
if ((amc->macs_mask & (1 << i)) && nd->used) { if ((amc->macs_mask & (1 << i)) &&
qemu_check_nic_model(nd, TYPE_FTGMAC100); !qemu_configure_nic_device(DEVICE(&bmc->soc->ftgmac100[i]),
qdev_set_nic_properties(DEVICE(&bmc->soc->ftgmac100[i]), nd); true, NULL)) {
nd++; break; /* No configs left; stop asking */
} }
} }