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: TizenStudio_2.0_p2.3~6959
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a9d697405069939767d3f82691b0f2abd8466db;p=sdk%2Femulator%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 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;
 }