From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnSWD-0004Yt-7o for qemu-devel@nongnu.org; Wed, 18 Jan 2012 05:13:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RnSW9-0001yr-9Y for qemu-devel@nongnu.org; Wed, 18 Jan 2012 05:13:25 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 18 Jan 2012 11:11:16 +0100 Message-Id: <1326881476-2419-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] grackle_pci: Clean up qdev names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf 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=C3=A4rber Cc: Alexander Graf Cc: Anthony Liguori --- 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; =20 - dev =3D qdev_create(NULL, "grackle"); + dev =3D qdev_create(NULL, "grackle-pcihost"); qdev_init_nofail(dev); s =3D sysbus_from_qdev(dev); d =3D FROM_SYSBUS(GrackleState, s); @@ -121,9 +121,10 @@ static int grackle_pci_host_init(PCIDevice *d) return 0; } =20 -static PCIDeviceInfo grackle_pci_host_info =3D { +static PCIDeviceInfo grackle_pci_info =3D { .qdev.name =3D "grackle", .qdev.size =3D sizeof(PCIDevice), + .qdev.no_user =3D 1, .init =3D grackle_pci_host_init, .vendor_id =3D PCI_VENDOR_ID_MOTOROLA, .device_id =3D PCI_DEVICE_ID_MOTOROLA_MPC106, @@ -131,11 +132,17 @@ static PCIDeviceInfo grackle_pci_host_info =3D { .class_id =3D PCI_CLASS_BRIDGE_HOST, }; =20 +static SysBusDeviceInfo grackle_pci_host_info =3D { + .qdev.name =3D "grackle-pcihost", + .qdev.size =3D sizeof(GrackleState), + .qdev.no_user =3D 1, + .init =3D 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); } =20 device_init(grackle_register_devices) --=20 1.7.7