tulip: Assign default MAC address if not specified
PATCH 1/1 tulip: Assign default MAC address if not specified
The MAC of the tulip card is stored in the EEPROM and at startup tulip_fill_eeprom() is called to initialize the EEPROM with the MAC address given on the command line, e.g.:
-device tulip,mac=00:11:22:33:44:55
In case the mac address was not given on the command line, tulip_fill_eeprom() initializes the MAC in EEPROM with 00:00:00:00:00:00 which breaks e.g. a HP-UX guest.
Fix this problem by moving qemu_macaddr_default_if_unset() a few lines up, so that a default mac address is assigned before tulip_fill_eeprom() initializes the EEPROM.
hw/net/tulip.c +2 -2
@@ -967,6 +967,8 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) pci_conf = s->dev.config; pci_conf[PCI_INTERRUPT_PIN ] =1 ;/* interrupt pin A */ +qemu_macaddr_default_if_unset (&s->c.macaddr); + s->eeprom =eeprom93xx_new (&pci_dev->qdev,64 );tulip_fill_eeprom (s);
@@ -981,8 +983,6 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) s->irq =pci_allocate_irq (&s->dev); -qemu_macaddr_default_if_unset (&s->c.macaddr); - s->nic =qemu_new_nic (&net_tulip_info, &s->c,object_get_typename (OBJECT (pci_dev)), pci_dev->qdev.id, s);
Quoted 9 lines · Helge Deller
The MAC of the tulip card is stored in the EEPROM and at startup
tulip_fill_eeprom()is called to initialize the EEPROM with the MAC address given on the command line, e.g.:-device tulip,mac=00:11:22:33:44:55In case the mac address was not given on the command line,
tulip_fill_eeprom()initializes the MAC in EEPROM with 00:00:00:00:00:00 which breaks e.g. a HP-UX guest.
Quoted 5 lines
Fix this problem by moving
qemu_macaddr_default_if_unset()a few lines up, so that a default mac address is assigned beforetulip_fill_eeprom()initializes the EEPROM.Signed-off-by Helge Deller <[email protected]>
Quoted 23 lines
hw/net/tulip.c +2
-2@@ -967,6 +967,8 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) pci_conf = s->dev.config; pci_conf[PCI_INTERRUPT_PIN ] =1 ;/* interrupt pin A */ +qemu_macaddr_default_if_unset (&s->c.macaddr); + s->eeprom =eeprom93xx_new (&pci_dev->qdev,64 );tulip_fill_eeprom (s);@@ -981,8 +983,6 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) s->irq =pci_allocate_irq (&s->dev); -qemu_macaddr_default_if_unset (&s->c.macaddr); - s->nic =qemu_new_nic (&net_tulip_info, &s->c,object_get_typename (OBJECT (pci_dev)), pci_dev->qdev.id, s);
Hi Jason,
Do you mind taking this single patch via your networking tree? Otherwise I Cc'ed qemu-trivial :)
Thanks!
Quoted 39 lines · Helge Deller
The MAC of the tulip card is stored in the EEPROM and at startup
tulip_fill_eeprom()is called to initialize the EEPROM with the MAC address given on the command line, e.g.:-device tulip,mac=00:11:22:33:44:55In case the mac address was not given on the command line,
tulip_fill_eeprom()initializes the MAC in EEPROM with 00:00:00:00:00:00 which breaks e.g. a HP-UX guest.Fix this problem by moving
qemu_macaddr_default_if_unset()a few lines up, so that a default mac address is assigned beforetulip_fill_eeprom()initializes the EEPROM.Signed-off-by Helge Deller <[email protected]>hw/net/tulip.c +2
-2@@ -967,6 +967,8 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) pci_conf = s->dev.config; pci_conf[PCI_INTERRUPT_PIN ] =1 ;/* interrupt pin A */ +qemu_macaddr_default_if_unset (&s->c.macaddr); + s->eeprom =eeprom93xx_new (&pci_dev->qdev,64 );tulip_fill_eeprom (s);@@ -981,8 +983,6 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) s->irq =pci_allocate_irq (&s->dev); -qemu_macaddr_default_if_unset (&s->c.macaddr); - s->nic =qemu_new_nic (&net_tulip_info, &s->c,object_get_typename (OBJECT (pci_dev)), pci_dev->qdev.id, s);
Quoted 5 lines · Philippe Mathieu-Daudé
Hi Jason,
Do you mind taking this single patch via your networking tree? Otherwise I Cc'ed qemu-trivial :)
I've queued this.
Thanks
Quoted 44 lines
Thanks!
Quoted 39 lines · Helge Deller
The MAC of the tulip card is stored in the EEPROM and at startup
tulip_fill_eeprom()is called to initialize the EEPROM with the MAC address given on the command line, e.g.:-device tulip,mac=00:11:22:33:44:55In case the mac address was not given on the command line,
tulip_fill_eeprom()initializes the MAC in EEPROM with 00:00:00:00:00:00 which breaks e.g. a HP-UX guest.Fix this problem by moving
qemu_macaddr_default_if_unset()a few lines up, so that a default mac address is assigned beforetulip_fill_eeprom()initializes the EEPROM.Signed-off-by Helge Deller <[email protected]>hw/net/tulip.c +2
-2@@ -967,6 +967,8 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) pci_conf = s->dev.config; pci_conf[PCI_INTERRUPT_PIN ] =1 ;/* interrupt pin A */ +qemu_macaddr_default_if_unset (&s->c.macaddr); + s->eeprom =eeprom93xx_new (&pci_dev->qdev,64 );tulip_fill_eeprom (s);@@ -981,8 +983,6 @@ static void pci_tulip_realize(PCIDevice *pci_dev, Error **errp) s->irq =pci_allocate_irq (&s->dev); -qemu_macaddr_default_if_unset (&s->c.macaddr); - s->nic =qemu_new_nic (&net_tulip_info, &s->c,object_get_typename (OBJECT (pci_dev)), pci_dev->qdev.id, s);