From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rji8w-0007kL-PY for qemu-devel@nongnu.org; Sat, 07 Jan 2012 21:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rji8v-0001x1-Dh for qemu-devel@nongnu.org; Sat, 07 Jan 2012 21:05:54 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59421 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rji8v-0001wo-0y for qemu-devel@nongnu.org; Sat, 07 Jan 2012 21:05:53 -0500 Message-ID: <4F08F9A6.6040602@suse.de> Date: Sun, 08 Jan 2012 03:04:22 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1325551939-24749-1-git-send-email-aliguori@us.ibm.com> <1325551939-24749-28-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1325551939-24749-28-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 27/30] unin_pci: remove phantom qdev devices in unin_pci List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Aurelien Jarno Am 03.01.2012 01:52, schrieb Anthony Liguori: > Same problem as with grackle. This code can't possibly work. For the record, this comment was not updated for v2: It does work. The name conflict needs to be resolved, e.g., by adding -pcihost to the SysBus device names. Andreas > Signed-off-by: Anthony Liguori > --- > hw/unin_pci.c | 77 -------------------------------------------------= -------- > 1 files changed, 0 insertions(+), 77 deletions(-) >=20 > diff --git a/hw/unin_pci.c b/hw/unin_pci.c > index 14d9914..b3365fe 100644 > --- a/hw/unin_pci.c > +++ b/hw/unin_pci.c > @@ -301,93 +301,16 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, > return d->host_state.bus; > } > =20 > -static int unin_main_pci_host_init(PCIDevice *d) > -{ > - d->config[0x0C] =3D 0x08; // cache_line_size > - d->config[0x0D] =3D 0x10; // latency_timer > - d->config[0x34] =3D 0x00; // capabilities_pointer > - return 0; > -} > - > -static int unin_agp_pci_host_init(PCIDevice *d) > -{ > - d->config[0x0C] =3D 0x08; // cache_line_size > - d->config[0x0D] =3D 0x10; // latency_timer > - // d->config[0x34] =3D 0x80; // capabilities_pointer > - return 0; > -} > - > -static int u3_agp_pci_host_init(PCIDevice *d) > -{ > - /* cache line size */ > - d->config[0x0C] =3D 0x08; > - /* latency timer */ > - d->config[0x0D] =3D 0x10; > - return 0; > -} > - > -static int unin_internal_pci_host_init(PCIDevice *d) > -{ > - d->config[0x0C] =3D 0x08; // cache_line_size > - d->config[0x0D] =3D 0x10; // latency_timer > - d->config[0x34] =3D 0x00; // capabilities_pointer > - return 0; > -} > - > -static PCIDeviceInfo unin_main_pci_host_info =3D { > - .qdev.name =3D "uni-north", > - .qdev.size =3D sizeof(PCIDevice), > - .init =3D unin_main_pci_host_init, > - .vendor_id =3D PCI_VENDOR_ID_APPLE, > - .device_id =3D PCI_DEVICE_ID_APPLE_UNI_N_PCI, > - .revision =3D 0x00, > - .class_id =3D PCI_CLASS_BRIDGE_HOST, > -}; > - > -static PCIDeviceInfo u3_agp_pci_host_info =3D { > - .qdev.name =3D "u3-agp", > - .qdev.size =3D sizeof(PCIDevice), > - .init =3D u3_agp_pci_host_init, > - .vendor_id =3D PCI_VENDOR_ID_APPLE, > - .device_id =3D PCI_DEVICE_ID_APPLE_U3_AGP, > - .revision =3D 0x00, > - .class_id =3D PCI_CLASS_BRIDGE_HOST, > -}; > - > -static PCIDeviceInfo unin_agp_pci_host_info =3D { > - .qdev.name =3D "uni-north-agp", > - .qdev.size =3D sizeof(PCIDevice), > - .init =3D unin_agp_pci_host_init, > - .vendor_id =3D PCI_VENDOR_ID_APPLE, > - .device_id =3D PCI_DEVICE_ID_APPLE_UNI_N_AGP, > - .revision =3D 0x00, > - .class_id =3D PCI_CLASS_BRIDGE_HOST, > -}; > - > -static PCIDeviceInfo unin_internal_pci_host_info =3D { > - .qdev.name =3D "uni-north-pci", > - .qdev.size =3D sizeof(PCIDevice), > - .init =3D unin_internal_pci_host_init, > - .vendor_id =3D PCI_VENDOR_ID_APPLE, > - .device_id =3D PCI_DEVICE_ID_APPLE_UNI_N_I_PCI, > - .revision =3D 0x00, > - .class_id =3D PCI_CLASS_BRIDGE_HOST, > -}; > - > static void unin_register_devices(void) > { > sysbus_register_dev("uni-north", sizeof(UNINState), > pci_unin_main_init_device); > - pci_qdev_register(&unin_main_pci_host_info); > sysbus_register_dev("u3-agp", sizeof(UNINState), > pci_u3_agp_init_device); > - pci_qdev_register(&u3_agp_pci_host_info); > sysbus_register_dev("uni-north-agp", sizeof(UNINState), > pci_unin_agp_init_device); > - pci_qdev_register(&unin_agp_pci_host_info); > sysbus_register_dev("uni-north-pci", sizeof(UNINState), > pci_unin_internal_init_device); > - pci_qdev_register(&unin_internal_pci_host_info); > } > =20 > device_init(unin_register_devices) --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg