From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Tue, 14 Jun 2011 22:37:47 +0000 (+0900)
Subject: pci: don't call qdev pci init method
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c2afc92290f2b5a8eb6f7b75338815012f90a5c7;p=qemu.git

pci: don't call qdev pci init method

As pci id initialization is moved to common layer,
some initialization function can be empty.
So don't call init method if NULL.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/pci.c b/hw/pci.c
index ba0598ba1d..b904a4ecb6 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1681,10 +1681,12 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base)
         do_pci_unregister_device(pci_dev);
         return -1;
     }
-    rc = info->init(pci_dev);
-    if (rc != 0) {
-        do_pci_unregister_device(pci_dev);
-        return rc;
+    if (info->init) {
+        rc = info->init(pci_dev);
+        if (rc != 0) {
+            do_pci_unregister_device(pci_dev);
+            return rc;
+        }
     }
 
     /* rom loading */