ftgmac100: do not link to netdev

[Qemu-devel] [PATCH] ftgmac100: do not link to netdev

Posted by Cédric Le Goater 6 years, 8 months ago

qdev_set_nic_properties() is already used in the Aspeed SoC level to
bind the ftgmac100 device to the netdev.

This is fixing support for multiple net devices.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/net/ftgmac100.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index 790430346b51..d9986c6baa92 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -1016,8 +1016,6 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)
     sysbus_init_irq(sbd, &s->irq);
     qemu_macaddr_default_if_unset(&s->conf.macaddr);
 
-    s->conf.peers.ncs[0] = nd_table[0].netdev;
-
     s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,
                           object_get_typename(OBJECT(dev)), DEVICE(dev)->id,
                           s);
-- 
2.20.1

Re: [Qemu-devel] [PATCH] ftgmac100: do not link to netdev

Posted by Jason Wang 6 years, 8 months ago

On 2019/5/21 上午2:11, Cédric Le Goater wrote:
> qdev_set_nic_properties() is already used in the Aspeed SoC level to
> bind the ftgmac100 device to the netdev.
>
> This is fixing support for multiple net devices.
>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> ---
>   hw/net/ftgmac100.c | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
> index 790430346b51..d9986c6baa92 100644
> --- a/hw/net/ftgmac100.c
> +++ b/hw/net/ftgmac100.c
> @@ -1016,8 +1016,6 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)
>       sysbus_init_irq(sbd, &s->irq);
>       qemu_macaddr_default_if_unset(&s->conf.macaddr);
>   
> -    s->conf.peers.ncs[0] = nd_table[0].netdev;
> -
>       s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,
>                             object_get_typename(OBJECT(dev)), DEVICE(dev)->id,
>                             s);


Applied.

Thanks

Re: [Qemu-devel] [PATCH] ftgmac100: do not link to netdev

Posted by Wim Vervoorn 6 years, 8 months ago

Hello Cédric,

Thanks a lot for your help. It is working now!

Best Regards,
Wim Vervoorn



"THIS MESSAGE CONTAINS CONFIDENTIAL INFORMATION. UNLESS YOU ARE THE INTENDED RECIPIENT OF THIS MESSAGE, ANY USE OF THIS MESSAGE IS STRICTLY PROHIBITED. IF YOU HAVE RECEIVED THIS MESSAGE IN ERROR, PLEASE IMMEDIATELY NOTIFY THE SENDER BY TELEPHONE +31-(0)73-5944664 OR REPLY EMAIL, AND IMMEDIATELY DELETE THIS MESSAGE AND ALL COPIES." 

-----Original Message-----
From: Cédric Le Goater [mailto:clg@kaod.org] 
Sent: Monday, May 20, 2019 8:11 PM
To: Jason Wang <jasowang@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>; Wim Vervoorn <wvervoorn@eltan.com>; Andrew Jeffery <andrew@aj.id.au>; Joel Stanley <joel@jms.id.au>; qemu-arm@nongnu.org; qemu-devel@nongnu.org; Cédric Le Goater <clg@kaod.org>
Subject: [PATCH] ftgmac100: do not link to netdev

qdev_set_nic_properties() is already used in the Aspeed SoC level to bind the ftgmac100 device to the netdev.

This is fixing support for multiple net devices.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/net/ftgmac100.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 790430346b51..d9986c6baa92 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -1016,8 +1016,6 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)
     sysbus_init_irq(sbd, &s->irq);
     qemu_macaddr_default_if_unset(&s->conf.macaddr);
 
-    s->conf.peers.ncs[0] = nd_table[0].netdev;
-
     s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,
                           object_get_typename(OBJECT(dev)), DEVICE(dev)->id,
                           s);
--
2.20.1