From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd2w2-0007p2-0P for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:53:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd2w0-0006c9-Lt for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:53:01 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:41721 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd2w0-0006by-DR for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:53:00 -0500 From: Anthony Liguori Date: Tue, 20 Dec 2011 10:51:54 -0600 Message-Id: <1324399916-21315-26-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1324399916-21315-1-git-send-email-aliguori@us.ibm.com> References: <1324399916-21315-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 25/27] 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: Paolo Bonzini , Anthony Liguori , Markus Armbruster Same problem as with grackle. This code can't possibly work. Signed-off-by: Anthony Liguori --- hw/unin_pci.c | 77 --------------------------------------------------------- 1 files changed, 0 insertions(+), 77 deletions(-) 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; } -static int unin_main_pci_host_init(PCIDevice *d) -{ - d->config[0x0C] = 0x08; // cache_line_size - d->config[0x0D] = 0x10; // latency_timer - d->config[0x34] = 0x00; // capabilities_pointer - return 0; -} - -static int unin_agp_pci_host_init(PCIDevice *d) -{ - d->config[0x0C] = 0x08; // cache_line_size - d->config[0x0D] = 0x10; // latency_timer - // d->config[0x34] = 0x80; // capabilities_pointer - return 0; -} - -static int u3_agp_pci_host_init(PCIDevice *d) -{ - /* cache line size */ - d->config[0x0C] = 0x08; - /* latency timer */ - d->config[0x0D] = 0x10; - return 0; -} - -static int unin_internal_pci_host_init(PCIDevice *d) -{ - d->config[0x0C] = 0x08; // cache_line_size - d->config[0x0D] = 0x10; // latency_timer - d->config[0x34] = 0x00; // capabilities_pointer - return 0; -} - -static PCIDeviceInfo unin_main_pci_host_info = { - .qdev.name = "uni-north", - .qdev.size = sizeof(PCIDevice), - .init = unin_main_pci_host_init, - .vendor_id = PCI_VENDOR_ID_APPLE, - .device_id = PCI_DEVICE_ID_APPLE_UNI_N_PCI, - .revision = 0x00, - .class_id = PCI_CLASS_BRIDGE_HOST, -}; - -static PCIDeviceInfo u3_agp_pci_host_info = { - .qdev.name = "u3-agp", - .qdev.size = sizeof(PCIDevice), - .init = u3_agp_pci_host_init, - .vendor_id = PCI_VENDOR_ID_APPLE, - .device_id = PCI_DEVICE_ID_APPLE_U3_AGP, - .revision = 0x00, - .class_id = PCI_CLASS_BRIDGE_HOST, -}; - -static PCIDeviceInfo unin_agp_pci_host_info = { - .qdev.name = "uni-north-agp", - .qdev.size = sizeof(PCIDevice), - .init = unin_agp_pci_host_init, - .vendor_id = PCI_VENDOR_ID_APPLE, - .device_id = PCI_DEVICE_ID_APPLE_UNI_N_AGP, - .revision = 0x00, - .class_id = PCI_CLASS_BRIDGE_HOST, -}; - -static PCIDeviceInfo unin_internal_pci_host_info = { - .qdev.name = "uni-north-pci", - .qdev.size = sizeof(PCIDevice), - .init = unin_internal_pci_host_init, - .vendor_id = PCI_VENDOR_ID_APPLE, - .device_id = PCI_DEVICE_ID_APPLE_UNI_N_I_PCI, - .revision = 0x00, - .class_id = 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); } device_init(unin_register_devices) -- 1.7.4.1