提交 c2afc922 编写于 作者: I Isaku Yamahata 提交者: Michael S. Tsirkin

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: NIsaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 befeac45
...@@ -1681,10 +1681,12 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) ...@@ -1681,10 +1681,12 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base)
do_pci_unregister_device(pci_dev); do_pci_unregister_device(pci_dev);
return -1; return -1;
} }
rc = info->init(pci_dev); if (info->init) {
if (rc != 0) { rc = info->init(pci_dev);
do_pci_unregister_device(pci_dev); if (rc != 0) {
return rc; do_pci_unregister_device(pci_dev);
return rc;
}
} }
/* rom loading */ /* rom loading */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册