[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.3 v2 22/46] hw/arm/aspeed: use qemu_configure_nic_device()
From: |
David Woodhouse |
Subject: |
[PATCH for-8.3 v2 22/46] hw/arm/aspeed: use qemu_configure_nic_device() |
Date: |
Mon, 6 Nov 2023 19:49:27 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/arm/aspeed.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index cc59176563..bed5e4f40b 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -356,7 +356,6 @@ static void aspeed_machine_init(MachineState *machine)
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 @@ static void aspeed_machine_init(MachineState *machine)
&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 */
}
}
--
2.41.0
- [PATCH for-8.3 v2 46/46] net: make nb_nics and nd_table[] static in net/net.c, (continued)
- [PATCH for-8.3 v2 46/46] net: make nb_nics and nd_table[] static in net/net.c, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 12/46] hw/mips/fuloong2e: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 33/46] hw/m68k/q800: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 38/46] hw/openrisc/openrisc_sim: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 11/46] hw/loongarch: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 36/46] hw/mips/jazz: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 02/46] net: report list of available models according to platform, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 39/46] hw/riscv: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 45/46] net: remove qemu_show_nic_models(), qemu_find_nic_model(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 20/46] hw/xtensa/virt: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 22/46] hw/arm/aspeed: use qemu_configure_nic_device(),
David Woodhouse <=
- [PATCH for-8.3 v2 17/46] hw/ppc: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 28/46] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 43/46] net: remove qemu_check_nic_model(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 04/46] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 05/46] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 14/46] hw/mips/loongson3_virt: use pci_init_nic_devices(), David Woodhouse, 2023/11/06