From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 25 Sep 2009 01:53:48 +0000 (+0200)
Subject: Fix pci_vga_init() not to ignore bus argument
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=48042d861e364c04d0431cc6f52594ea00267c80;p=qemu.git

Fix pci_vga_init() not to ignore bus argument

Commit a414c306 converted all VGA devices to qdev.  It used
pci_create_simple() for all devices, except for this one it used
pci_create().  That's wrong, because it uses PCI bus#0 regardless of
the bus argument.  Fix by switching to pci_create_noinit().

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

diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index ccc78e5b8a..17b373234f 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -125,7 +125,7 @@ int pci_vga_init(PCIBus *bus,
 {
     PCIDevice *dev;
 
-    dev = pci_create("VGA", NULL);
+    dev = pci_create_noinit(bus, -1, "VGA");
     qdev_prop_set_uint32(&dev->qdev, "bios-offset", vga_bios_offset);
     qdev_prop_set_uint32(&dev->qdev, "bios-size", vga_bios_offset);
     qdev_init(&dev->qdev);