From patchwork Tue Jan 24 19:33:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 137622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3FF35B6F65 for ; Wed, 25 Jan 2012 06:41:35 +1100 (EST) Received: from localhost ([::1]:46912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmFG-0006n3-Li for incoming@patchwork.ozlabs.org; Tue, 24 Jan 2012 14:41:30 -0500 Received: from eggs.gnu.org ([140.186.70.92]:55987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmF2-0006Wf-Gw for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpmEu-0005dn-V0 for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:41:16 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:40360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmEu-0005dX-OB for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:41:08 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Jan 2012 14:41:07 -0500 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 24 Jan 2012 14:41:06 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 279DB38C815C; Tue, 24 Jan 2012 14:35:30 -0500 (EST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0OJYBul335986; Tue, 24 Jan 2012 14:34:13 -0500 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0OJXnO0009504; Tue, 24 Jan 2012 12:33:49 -0700 Received: from titi.austin.rr.com (sig-9-65-115-125.mts.ibm.com [9.65.115.125]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q0OJXNdf006821; Tue, 24 Jan 2012 12:33:48 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Tue, 24 Jan 2012 13:33:15 -0600 Message-Id: <1327433600-7403-24-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> References: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12012419-7182-0000-0000-000000902764 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.139 Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH 23/28] unin_pci: Clean up qdev names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber Add -pcihost to SysBus devices to resolve name conflicts, and clarify PCI vs. Internal PCI. Signed-off-by: Andreas Färber Signed-off-by: Alexander Graf --- hw/unin_pci.c | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 14d9914..be0e98c 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -213,7 +213,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic, /* Use values found on a real PowerMac */ /* Uninorth main bus */ - dev = qdev_create(NULL, "uni-north"); + dev = qdev_create(NULL, "uni-north-pci-pcihost"); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); d = FROM_SYSBUS(UNINState, s); @@ -245,7 +245,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic, /* Uninorth AGP bus */ pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north-agp"); - dev = qdev_create(NULL, "uni-north-agp"); + dev = qdev_create(NULL, "uni-north-agp-pcihost"); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); sysbus_mmio_map(s, 0, 0xf0800000); @@ -254,8 +254,9 @@ PCIBus *pci_pmac_init(qemu_irq *pic, /* Uninorth internal bus */ #if 0 /* XXX: not needed for now */ - pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), "uni-north-pci"); - dev = qdev_create(NULL, "uni-north-pci"); + pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), + "uni-north-internal-pci"); + dev = qdev_create(NULL, "uni-north-internal-pci-pcihost"); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); sysbus_mmio_map(s, 0, 0xf4800000); @@ -275,7 +276,7 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, /* Uninorth AGP bus */ - dev = qdev_create(NULL, "u3-agp"); + dev = qdev_create(NULL, "u3-agp-pcihost"); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); d = FROM_SYSBUS(UNINState, s); @@ -335,7 +336,7 @@ static int unin_internal_pci_host_init(PCIDevice *d) } static PCIDeviceInfo unin_main_pci_host_info = { - .qdev.name = "uni-north", + .qdev.name = "uni-north-pci", .qdev.size = sizeof(PCIDevice), .init = unin_main_pci_host_init, .vendor_id = PCI_VENDOR_ID_APPLE, @@ -365,7 +366,7 @@ static PCIDeviceInfo unin_agp_pci_host_info = { }; static PCIDeviceInfo unin_internal_pci_host_info = { - .qdev.name = "uni-north-pci", + .qdev.name = "uni-north-internal-pci", .qdev.size = sizeof(PCIDevice), .init = unin_internal_pci_host_init, .vendor_id = PCI_VENDOR_ID_APPLE, @@ -374,19 +375,42 @@ static PCIDeviceInfo unin_internal_pci_host_info = { .class_id = PCI_CLASS_BRIDGE_HOST, }; +static SysBusDeviceInfo sysbus_unin_pci_host_info = { + .qdev.name = "uni-north-pci-pcihost", + .qdev.size = sizeof(UNINState), + .init = pci_unin_main_init_device, +}; + +static SysBusDeviceInfo sysbus_u3_agp_pci_host_info = { + .qdev.name = "u3-agp-pcihost", + .qdev.size = sizeof(UNINState), + .init = pci_u3_agp_init_device, +}; + +static SysBusDeviceInfo sysbus_unin_agp_pci_host_info = { + .qdev.name = "uni-north-agp-pcihost", + .qdev.size = sizeof(UNINState), + .init = pci_unin_agp_init_device, +}; + +static SysBusDeviceInfo sysbus_unin_internal_pci_host_info = { + .qdev.name = "uni-north-internal-pci-pcihost", + .qdev.size = sizeof(UNINState), + .init = pci_unin_internal_init_device, +}; + static void unin_register_devices(void) { - sysbus_register_dev("uni-north", sizeof(UNINState), - pci_unin_main_init_device); + sysbus_register_withprop(&sysbus_unin_pci_host_info); pci_qdev_register(&unin_main_pci_host_info); - sysbus_register_dev("u3-agp", sizeof(UNINState), - pci_u3_agp_init_device); + + sysbus_register_withprop(&sysbus_u3_agp_pci_host_info); pci_qdev_register(&u3_agp_pci_host_info); - sysbus_register_dev("uni-north-agp", sizeof(UNINState), - pci_unin_agp_init_device); + + sysbus_register_withprop(&sysbus_unin_agp_pci_host_info); pci_qdev_register(&unin_agp_pci_host_info); - sysbus_register_dev("uni-north-pci", sizeof(UNINState), - pci_unin_internal_init_device); + + sysbus_register_withprop(&sysbus_unin_internal_pci_host_info); pci_qdev_register(&unin_internal_pci_host_info); }