[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.3 v2 24/46] hw/arm/fsl: use qemu_configure_nic_device()
From: |
David Woodhouse |
Subject: |
[PATCH for-8.3 v2 24/46] hw/arm/fsl: use qemu_configure_nic_device() |
Date: |
Mon, 6 Nov 2023 19:49:29 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
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 24c4374590..28084d2e5a 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -170,7 +170,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error
**errp)
}
object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, &err);
- 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 4fa7f0b95e..273bc79283 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -380,7 +380,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
}
object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, &err);
- 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 e37b69a5e1..ca3dd439ec 100644
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -442,7 +442,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 474cfdc87c..1acbe065db 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -446,7 +446,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.41.0
- [PATCH for-8.3 v2 00/46] Rework matching of network devices to -nic options, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 24/46] hw/arm/fsl: use qemu_configure_nic_device(),
David Woodhouse <=
- [PATCH for-8.3 v2 16/46] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 15/46] hw/ppc/prep: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 30/46] hw/arm: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 01/46] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 41/46] hw/sparc/sun4m: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 18/46] hw/sh4/r2d: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 06/46] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 10/46] hw/hppa: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 21/46] hw/arm/allwinner: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 34/46] hw/microblaze: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06