From patchwork Sat Jan 21 04:19:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 137174 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 30F6AB6F71 for ; Sat, 21 Jan 2012 16:34:03 +1100 (EST) Received: from localhost ([::1]:56055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSQy-0008O6-LA for incoming@patchwork.ozlabs.org; Fri, 20 Jan 2012 23:20:08 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSQE-0007DG-W7 for qemu-devel@nongnu.org; Fri, 20 Jan 2012 23:19:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RoSQB-0001UC-Oh for qemu-devel@nongnu.org; Fri, 20 Jan 2012 23:19:22 -0500 Received: from cantor2.suse.de ([195.135.220.15]:57178 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSQB-0001TT-1p; Fri, 20 Jan 2012 23:19:19 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id B6836915A2; Sat, 21 Jan 2012 05:19:17 +0100 (CET) From: Alexander Graf To: qemu-ppc@nongnu.org Date: Sat, 21 Jan 2012 05:19:11 +0100 Message-Id: <1327119551-29674-27-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1327119551-29674-1-git-send-email-agraf@suse.de> References: <1327119551-29674-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Anthony Liguori , qemu-devel Developers , Blue Swirl , =?utf-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Subject: [Qemu-devel] [PATCH 26/26] grackle_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 Rename SysBus device from 'grackle' to 'grackle-pcihost' to resolve a name conflict. Also mark both devices as no_user. Signed-off-by: Andreas Färber Cc: Alexander Graf Cc: Anthony Liguori Signed-off-by: Alexander Graf --- hw/grackle_pci.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 1e529fb..be10a6d 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -71,7 +71,7 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, SysBusDevice *s; GrackleState *d; - dev = qdev_create(NULL, "grackle"); + dev = qdev_create(NULL, "grackle-pcihost"); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); d = FROM_SYSBUS(GrackleState, s); @@ -121,9 +121,10 @@ static int grackle_pci_host_init(PCIDevice *d) return 0; } -static PCIDeviceInfo grackle_pci_host_info = { +static PCIDeviceInfo grackle_pci_info = { .qdev.name = "grackle", .qdev.size = sizeof(PCIDevice), + .qdev.no_user = 1, .init = grackle_pci_host_init, .vendor_id = PCI_VENDOR_ID_MOTOROLA, .device_id = PCI_DEVICE_ID_MOTOROLA_MPC106, @@ -131,11 +132,17 @@ static PCIDeviceInfo grackle_pci_host_info = { .class_id = PCI_CLASS_BRIDGE_HOST, }; +static SysBusDeviceInfo grackle_pci_host_info = { + .qdev.name = "grackle-pcihost", + .qdev.size = sizeof(GrackleState), + .qdev.no_user = 1, + .init = pci_grackle_init_device, +}; + static void grackle_register_devices(void) { - sysbus_register_dev("grackle", sizeof(GrackleState), - pci_grackle_init_device); - pci_qdev_register(&grackle_pci_host_info); + sysbus_register_withprop(&grackle_pci_host_info); + pci_qdev_register(&grackle_pci_info); } device_init(grackle_register_devices)