From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 16 Jun 2009 14:24:44 +0000 (+0200)
Subject: qdev: Fix regression in "pci_add ... storage if=virtio, ..."
X-Git-Tag: v0.11.0-rc0~378
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3fa1e0f36ee3b4fc61bd5c6b681c82932ebec41;p=thirdparty%2Fqemu.git

qdev: Fix regression in "pci_add ... storage if=virtio, ..."

qemu_pci_hot_add_storage() runs qdev_init() twice.  Broken in commit
07e3af9a "Virtio-blk qdev conversion".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index abe5bae4ac8..4d49c29c429 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -122,7 +122,6 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, PCIBus *pci_bus,
         break;
     case IF_VIRTIO:
         opaque = pci_create_simple(pci_bus, -1, "virtio-blk-pci");
-        qdev_init(opaque);
         break;
     }