[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 27/30] unin_pci: remove phantom qdev devices in
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH 27/30] unin_pci: remove phantom qdev devices in unin_pci |
Date: |
Sun, 08 Jan 2012 03:04:22 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111220 Thunderbird/9.0 |
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 <address@hidden>
> ---
> 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)
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
- Re: [Qemu-devel] [PATCH 10/30] qdev: don't access name through info, (continued)
[Qemu-devel] [PATCH 18/30] ssi: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 24/30] spapr: convert to QEMU Object Model (v2), Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 23/30] scsi: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 15/30] isa: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 22/30] ide: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 21/30] hda-codec: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 30/30] virtio-s390: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 27/30] unin_pci: remove phantom qdev devices in unin_pci, Anthony Liguori, 2012/01/02
- Re: [Qemu-devel] [PATCH 27/30] unin_pci: remove phantom qdev devices in unin_pci,
Andreas Färber <=
[Qemu-devel] [PATCH 17/30] ccid: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 26/30] grackle: remove broken pci device, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 12/30] qdev: add a interface to register subclasses, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 20/30] i2c: smbus: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 16/30] usb: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 25/30] virtio-serial: convert to QEMU Object Model, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 19/30] i2c: rename i2c_slave -> I2CSlave, Anthony Liguori, 2012/01/02
[Qemu-devel] [PATCH 28/30] pci: convert to QEMU Object Model, Anthony Liguori, 2012/01/02