[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device()
From: |
David Woodhouse |
Subject: |
[PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device() |
Date: |
Thu, 1 Feb 2024 16:43:49 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/fsl-imx25.c | 2 +-
hw/arm/fsl-imx6.c | 2 +-
hw/arm/fsl-imx6ul.c | 2 +-
hw/arm/fsl-imx7.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 4a49507ef1..5ed87edfe4 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -171,7 +171,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error
**errp)
object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num,
&error_abort);
- qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
+ qemu_configure_nic_device(DEVICE(&s->fec), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) {
return;
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index b7f93d8d9c..85748cb233 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -388,7 +388,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num,
&error_abort);
- qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]);
+ qemu_configure_nic_device(DEVICE(&s->eth), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) {
return;
}
diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 343bd65d1b..19f443570b 100644
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -473,7 +473,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error
**errp)
s->phy_num[i], &error_abort);
object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",
FSL_IMX6UL_ETH_NUM_TX_RINGS, &error_abort);
- qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]);
+ qemu_configure_nic_device(DEVICE(&s->eth[i]), true, NULL);
sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0,
diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 5728109491..9f2ef34555 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -447,7 +447,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
s->phy_num[i], &error_abort);
object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",
FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort);
- qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]);
+ qemu_configure_nic_device(DEVICE(&s->eth[i]), true, NULL);
sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0, FSL_IMX7_ENETn_ADDR[i]);
--
2.43.0
- [PULL 26/47] hw/net/lan9118: use qemu_configure_nic_device(), (continued)
- [PULL 26/47] hw/net/lan9118: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 20/47] hw/xtensa/virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 15/47] hw/ppc/prep: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs, David Woodhouse, 2024/02/01
- [PULL 18/47] hw/sh4/r2d: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 03/47] net: add qemu_create_nic_bus_devices(), David Woodhouse, 2024/02/01
- [PULL 13/47] hw/mips/malta: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 22/47] hw/arm/aspeed: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases, David Woodhouse, 2024/02/01
- [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device(),
David Woodhouse <=
- [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model(), David Woodhouse, 2024/02/01
- [PULL 37/47] hw/net/lasi_i82596: Re-enable build, David Woodhouse, 2024/02/01
- [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 17/47] hw/ppc: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 09/47] hw/arm/virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 14/47] hw/mips/loongson3_virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), David Woodhouse, 2024/02/01
- [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device(), David Woodhouse, 2024/02/01