[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RfC PATCH v3 06/10] ne2k_isa: qdev-ify.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RfC PATCH v3 06/10] ne2k_isa: qdev-ify. |
Date: |
Fri, 16 Oct 2009 15:41:59 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/ne2000-isa.c | 12 ++++++++----
hw/ne2000.c | 6 +++---
hw/ne2000.h | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index e346731..1bed5d4 100644
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -65,13 +65,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(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);
+ 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 +85,11 @@ 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_prop_set_macaddr(&dev->qdev, "mac", nd->macaddr);
+ if (nd->vlan)
+ qdev_prop_set_int32(&dev->qdev, "vlan", nd->vlan->id);
qdev_init_nofail(&dev->qdev);
}
@@ -97,6 +100,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(),
},
};
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 87f1e59..7ce56ff 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;
diff --git a/hw/ne2000.h b/hw/ne2000.h
index 92a2ddb..7842246 100644
--- a/hw/ne2000.h
+++ b/hw/ne2000.h
@@ -23,7 +23,7 @@ typedef struct NE2000State {
uint8_t mult[8]; /* multicast mask array */
qemu_irq irq;
VLANClientState *vc;
- uint8_t macaddr[6];
+ NICConf c;
uint8_t mem[NE2000_MEM_SIZE];
} NE2000State;
--
1.6.2.5
- [Qemu-devel] [RfC PATCH v3 00/10] qdev-ify network cards, Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 01/10] net: macaddr tweaks., Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 07/10] qdev: add qdev_prop_exists(), Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 10/10] ne2k_pci: load rom., Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 03/10] qdev: add netdev property, Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 04/10] qdev: add vlan property, Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 02/10] qdev: mac addr property fixups, Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 08/10] prepare pci nic init path for qdev conversion, Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 06/10] ne2k_isa: qdev-ify.,
Gerd Hoffmann <=
- [Qemu-devel] [RfC PATCH v3 05/10] qdev/net: common nic property bits, Gerd Hoffmann, 2009/10/16
- [Qemu-devel] [RfC PATCH v3 09/10] ne2k_pci: qdev-ify., Gerd Hoffmann, 2009/10/16
- Re: [Qemu-devel] [RfC PATCH v3 00/10] qdev-ify network cards, Mark McLoughlin, 2009/10/19