From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 21 Oct 2009 13:25:29 +0000 (+0200)
Subject: prepare pci nic init path for qdev property configuration.
X-Git-Tag: v0.12.0-rc0~584
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc7aff118b6ec245c227c9e630c8928bf2e093ec;p=thirdparty%2Fqemu.git

prepare pci nic init path for qdev property configuration.

Initialization path will work with both converted and not-converted
drivers, so we can convert drivers one by one.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pci.c b/hw/pci.c
index abf07cabd0e..fe2c4bd3d35 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;
 }