diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-10-21 15:25:27 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-27 12:28:38 -0500 |
commit | 93db66850d99fd9885edeff6af5679be51e1c610 (patch) | |
tree | 42089679a4a14a24105615425485bcf8434b081a /hw/ne2000.c | |
parent | ed16ab5afae7f5b1be58764d0e1eae20ce48d9ad (diff) |
ne2k_isa: use qdev properties for configuration.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ne2000.c')
-rw-r--r-- | hw/ne2000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ne2000.c b/hw/ne2000.c index 87f1e59d85..7ce56ff84d 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -126,7 +126,7 @@ void ne2000_reset(NE2000State *s) int i; s->isr = ENISR_RESET; - memcpy(s->mem, s->macaddr, 6); + memcpy(s->mem, &s->c.macaddr, 6); s->mem[14] = 0x57; s->mem[15] = 0x57; @@ -758,13 +758,13 @@ static int pci_ne2000_init(PCIDevice *pci_dev) PCI_ADDRESS_SPACE_IO, ne2000_map); s = &d->ne2000; s->irq = d->dev.irq[0]; - qdev_get_macaddr(&d->dev.qdev, s->macaddr); + qdev_get_macaddr(&d->dev.qdev, s->c.macaddr.a); ne2000_reset(s); s->vc = qdev_get_vlan_client(&d->dev.qdev, ne2000_can_receive, ne2000_receive, NULL, ne2000_cleanup, s); - qemu_format_nic_info_str(s->vc, s->macaddr); + qemu_format_nic_info_str(s->vc, s->c.macaddr.a); register_savevm("ne2000", -1, 3, pci_ne2000_save, pci_ne2000_load, d); return 0; |