commit b3cfec5bc925c8c06aa6631f7f0e7391946de372
author David Woodhouse <dwmw@amazon.co.uk> Mon Oct 23 09:37:30 2023 +0100
committer David Woodhouse <dwmw@amazon.co.uk> Fri Feb 02 16:23:47 2024 +0000
tree 21d4e1368b7a21113fb3a3b8d093a17f434c5fe6
parent 7e9c15ace60e4e443bc196b7e7bcd8e405653083

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>

hw/arm/aspeed.c

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index fc8355c..09b1e82 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -356,7 +356,6 @@
     AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
     AspeedSoCClass *sc;
     int i;
-    NICInfo *nd = &nd_table[0];
 
     bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
     object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
@@ -371,10 +370,10 @@
                              &error_fatal);
 
     for (i = 0; i < sc->macs_num; i++) {
-        if ((amc->macs_mask & (1 << i)) && nd->used) {
-            qemu_check_nic_model(nd, TYPE_FTGMAC100);
-            qdev_set_nic_properties(DEVICE(&bmc->soc->ftgmac100[i]), nd);
-            nd++;
+        if ((amc->macs_mask & (1 << i)) &&
+            !qemu_configure_nic_device(DEVICE(&bmc->soc->ftgmac100[i]),
+                                       true, NULL)) {
+            break; /* No configs left; stop asking */
         }
     }