Skip to contentSkip to conversation

ftgmac100: do not link to netdev

PATCH Applied Cédric Le Goater 3 participants 3 messages May 20, 2019 – May 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 hw/net/ftgmac100.c | 2 --
 1 file changed, 2 deletions(-)
hw/net/ftgmac100.c +0 -2
index 790430346b51..d9986c6baa92 100644
@@ -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);
Signature · 1 line
2.20.1
Applied
#1 lore raw
Quoted 15 lines · Cédric Le Goater

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.

---
  hw/net/ftgmac100.c | 2 --
  1 file changed, 2 deletions(-)
hw/net/ftgmac100.c +0 -0
index 790430346b51..d9986c6baa92 100644

hw/net/ftgmac100.c static void ftgmac100_realize(DeviceState *dev, Error **errp) · line 1021

Quoted 8 lines
hw/net/ftgmac100.c +0 -2
@@ -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

#2 lore raw
In reply to Cédric Le Goater

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:[email protected]]
Sent: Monday, May 20, 2019 8:11 PM
To: Jason Wang <[email protected]>
Cc: Peter Maydell <[email protected]>; Wim Vervoorn <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; [email protected]; [email protected]; Cédric Le Goater <[email protected]>
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.

---
 hw/net/ftgmac100.c | 2 --
 1 file changed, 2 deletions(-)
hw/net/ftgmac100.c +0 -2
@@ -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