[v3] Rework matching of network devices to -nic options

[PATCH v3 23/46] hw/arm/exynos4: use qemu_create_nic_device()

Posted by David Woodhouse 2 years, 1 month ago

From: David Woodhouse <dwmw@amazon.co.uk>

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
 hw/arm/exynos4_boards.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index b0e13eb4f0..003992189b 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -76,10 +76,8 @@ static void lan9215_init(uint32_t base, qemu_irq irq)
     SysBusDevice *s;
 
     /* This should be a 9215 but the 9118 is close enough */
-    if (nd_table[0].used) {
-        qemu_check_nic_model(&nd_table[0], "lan9118");
-        dev = qdev_new(TYPE_LAN9118);
-        qdev_set_nic_properties(dev, &nd_table[0]);
+    dev = qemu_create_nic_device(TYPE_LAN9118, true, NULL);
+    if (dev) {
         qdev_prop_set_uint32(dev, "mode_16bit", 1);
         s = SYS_BUS_DEVICE(dev);
         sysbus_realize_and_unref(s, &error_fatal);
-- 
2.41.0

Re: [PATCH v3 23/46] hw/arm/exynos4: use qemu_create_nic_device()

Posted by Thomas Huth 2 years ago

On 08/01/2024 21.26, David Woodhouse wrote:
> From: David Woodhouse <dwmw@amazon.co.uk>
> 
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
>   hw/arm/exynos4_boards.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
> index b0e13eb4f0..003992189b 100644
> --- a/hw/arm/exynos4_boards.c
> +++ b/hw/arm/exynos4_boards.c
> @@ -76,10 +76,8 @@ static void lan9215_init(uint32_t base, qemu_irq irq)
>       SysBusDevice *s;
>   
>       /* This should be a 9215 but the 9118 is close enough */
> -    if (nd_table[0].used) {
> -        qemu_check_nic_model(&nd_table[0], "lan9118");
> -        dev = qdev_new(TYPE_LAN9118);
> -        qdev_set_nic_properties(dev, &nd_table[0]);
> +    dev = qemu_create_nic_device(TYPE_LAN9118, true, NULL);
> +    if (dev) {
>           qdev_prop_set_uint32(dev, "mode_16bit", 1);
>           s = SYS_BUS_DEVICE(dev);
>           sysbus_realize_and_unref(s, &error_fatal);

Reviewed-by: Thomas Huth <thuth@redhat.com>