From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mr00Y-00040x-96 for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:54:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mr00T-0003zj-IB for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:54:01 -0400 Received: from [199.232.76.173] (port=39175 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mr00T-0003zg-EI for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:53:57 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:39224) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mr00S-0000a3-Ug for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:53:57 -0400 Received: from pike.pond.sub.org (pD9E39B51.dip.t-dialin.net [217.227.155.81]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 28EB4276CB5 for ; Fri, 25 Sep 2009 03:53:53 +0200 (CEST) From: Markus Armbruster Date: Fri, 25 Sep 2009 03:53:48 +0200 Message-Id: <187e449af41d81e8efb449bc73deb9a4d95c80bb.1253843232.git.armbru@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH 1/6] Fix pci_vga_init() not to ignore bus argument List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/vga-pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 6038cec..129ff48 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -137,7 +137,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); -- 1.6.2.5