[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/22] prepare pci nic init path for qdev property c
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 08/22] prepare pci nic init path for qdev property configuration. |
Date: |
Wed, 21 Oct 2009 15:25:29 +0200 |
Initialization path will work with both converted and not-converted
drivers, so we can convert drivers one by one.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index abf07ca..fe2c4bd 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -859,10 +859,16 @@ 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_set_nic_properties(dev, nd);
+ } 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] [PATCH 01/22] qdev-ify network cards, Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 04/22] qdev: add vlan property, Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 03/22] qdev: add netdev property, Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 01/22] net: add macaddr type., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 02/22] qdev: mac addr property fixups, Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 07/22] qdev: add qdev_prop_exists(), Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 08/22] prepare pci nic init path for qdev property configuration.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 05/22] qdev/net: common nic property bits, Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 09/22] ne2k_pci: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 06/22] ne2k_isa: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 11/22] pcnet: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 10/22] e1000: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 13/22] rtl8139: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 14/22] virtio: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 12/22] pcnet: split away lance.c (sparc32 code)., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 21/22] kill dead nic unplug code., Gerd Hoffmann, 2009/10/21