[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RfC PATCH v3 08/10] prepare pci nic init path for qdev con
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RfC PATCH v3 08/10] prepare pci nic init path for qdev conversion |
Date: |
Fri, 16 Oct 2009 15:42:01 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index abf07ca..fe8e939 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -859,10 +859,20 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char
*default_model,
dev = &pci_dev->qdev;
if (nd->name)
dev->id = qemu_strdup(nd->name);
- dev->nd = nd;
+ if (qdev_prop_exists(dev, "mac")) {
+ /* qdev-ified */
+ qdev_prop_set_macaddr(dev, "mac", nd->macaddr);
+ if (nd->vlan)
+ qdev_prop_set_vlan(dev, "vlan", nd->vlan);
+ if (nd->netdev)
+ qdev_prop_set_netdev(dev, "netdev", nd->netdev);
+ } else {
+ /* legacy */
+ dev->nd = nd;
+ nd->private = dev;
+ }
if (qdev_init(dev) < 0)
return NULL;
- nd->private = dev;
return pci_dev;
}
--
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 <=
- [Qemu-devel] [RfC PATCH v3 06/10] ne2k_isa: qdev-ify., Gerd Hoffmann, 2009/10/16
- [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