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-isa.c | |
| parent | ed16ab5afae7f5b1be58764d0e1eae20ce48d9ad (diff) | |
| download | qemu-93db66850d99fd9885edeff6af5679be51e1c610.tar.gz qemu-93db66850d99fd9885edeff6af5679be51e1c610.tar.bz2 qemu-93db66850d99fd9885edeff6af5679be51e1c610.zip | |
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-isa.c')
| -rw-r--r-- | hw/ne2000-isa.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index e3467316e0..abb9b97d55 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -38,13 +38,8 @@ typedef struct ISANE2000State { static void isa_ne2000_cleanup(VLANClientState *vc) { NE2000State *s = vc->opaque; - ISANE2000State *isa = container_of(s, ISANE2000State, ne2000); - unregister_savevm("ne2000", s); - - isa_unassign_ioport(isa->iobase, 16); - isa_unassign_ioport(isa->iobase + 0x10, 2); - isa_unassign_ioport(isa->iobase + 0x1f, 1); + s->vc = NULL; } static int isa_ne2000_initfn(ISADevice *dev) @@ -65,13 +60,14 @@ static int isa_ne2000_initfn(ISADevice *dev) isa_init_irq(dev, &s->irq, isa->isairq); - qdev_get_macaddr(&dev->qdev, s->macaddr); + qemu_macaddr_default_if_unset(&s->c.macaddr); ne2000_reset(s); - s->vc = qdev_get_vlan_client(&dev->qdev, + s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, s->c.vlan, s->c.peer, + dev->qdev.info->name, dev->qdev.id, ne2000_can_receive, ne2000_receive, NULL, - isa_ne2000_cleanup, s); - qemu_format_nic_info_str(s->vc, s->macaddr); + NULL, isa_ne2000_cleanup, s); + qemu_format_nic_info_str(s->vc, s->c.macaddr.a); register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s); return 0; @@ -84,9 +80,9 @@ void isa_ne2000_init(int base, int irq, NICInfo *nd) qemu_check_nic_model(nd, "ne2k_isa"); dev = isa_create("ne2k_isa"); - dev->qdev.nd = nd; /* hack alert */ qdev_prop_set_uint32(&dev->qdev, "iobase", base); qdev_prop_set_uint32(&dev->qdev, "irq", irq); + qdev_set_nic_properties(&dev->qdev, nd); qdev_init_nofail(&dev->qdev); } @@ -97,6 +93,7 @@ static ISADeviceInfo ne2000_isa_info = { .qdev.props = (Property[]) { DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300), DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), + DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), DEFINE_PROP_END_OF_LIST(), }, }; |