[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 06/13] convert pci bridge to qdev
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH 06/13] convert pci bridge to qdev |
Date: |
Wed, 23 Sep 2009 19:02:00 +0300 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Tue, Sep 22, 2009 at 11:29:20AM +0200, Gerd Hoffmann wrote:
> @@ -890,15 +890,12 @@ PCIDevice *pci_find_device(int bus_num, int slot, int
> function)
> return bus->devices[PCI_DEVFN(slot, function)];
> }
>
> -PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did,
> - pci_map_irq_fn map_irq, const char *name)
> +static int pci_bridge_initfn(PCIDevice *dev)
pci_bridge_dev_init a better name?
> {
> - PCIBridge *s;
> - s = (PCIBridge *)pci_register_device(bus, name, sizeof(PCIBridge),
> - devfn, NULL,
> pci_bridge_write_config);
> + PCIBridge *s = DO_UPCAST(PCIBridge, dev, dev);
>
> - pci_config_set_vendor_id(s->dev.config, vid);
> - pci_config_set_device_id(s->dev.config, did);
> + pci_config_set_vendor_id(s->dev.config, s->vid);
> + pci_config_set_device_id(s->dev.config, s->did);
>
> s->dev.config[0x04] = 0x06; // command = bus master, pci mem
> s->dev.config[0x05] = 0x00;
> @@ -911,9 +908,23 @@ PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t
> vid, uint16_t did,
> s->dev.config[PCI_HEADER_TYPE] =
> PCI_HEADER_TYPE_MULTI_FUNCTION | PCI_HEADER_TYPE_BRIDGE; //
> header_type
> s->dev.config[0x1E] = 0xa0; // secondary status
> + return 0;
> +}
>
> - s->bus = pci_register_secondary_bus(&s->dev, map_irq, name);
> - return s->bus;
> +PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did,
> + pci_map_irq_fn map_irq, const char *name)
> +{
> + PCIDevice *dev;
> + PCIBridge *s;
> +
> + dev = pci_create_noinit(bus, devfn, "pci-bridge");
> + qdev_prop_set_uint32(&dev->qdev, "vendorid", vid);
> + qdev_prop_set_uint32(&dev->qdev, "deviceid", did);
> + qdev_init(&dev->qdev);
> +
> + s = DO_UPCAST(PCIBridge, dev, dev);
> + pci_register_secondary_bus(&s->bus, &s->dev, map_irq, name);
> + return &s->bus;
> }
>
> static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base)
> @@ -1074,3 +1085,22 @@ static void pcibus_dev_print(Monitor *mon, DeviceState
> *dev, int indent)
> r->addr, r->addr + r->size - 1);
> }
> }
> +
> +static PCIDeviceInfo bridge_info = {
> + .qdev.name = "pci-bridge",
> + .qdev.size = sizeof(PCIBridge),
> + .init = pci_bridge_initfn,
> + .config_write = pci_bridge_write_config,
> + .qdev.props = (Property[]) {
> + DEFINE_PROP_HEX32("vendorid", PCIBridge, vid, 0),
> + DEFINE_PROP_HEX32("deviceid", PCIBridge, did, 0),
> + DEFINE_PROP_END_OF_LIST(),
> + }
> +};
> +
> +static void pci_register_devices(void)
> +{
> + pci_qdev_register(&bridge_info);
> +}
> +
> +device_init(pci_register_devices)
> --
> 1.6.2.5
>
>
- Re: [Qemu-devel] [PATCH 12/13] pci: move unregister from PCIDevice to PCIDeviceInfo, (continued)
[Qemu-devel] [PATCH 09/13] Add exit callback to DeviceInfo., Gerd Hoffmann, 2009/09/22
[Qemu-devel] [PATCH 13/13] usb: hook unplug into qdev, cleanups + fixes., Gerd Hoffmann, 2009/09/22
[Qemu-devel] [PATCH 06/13] convert pci bridge to qdev, Gerd Hoffmann, 2009/09/22
- Re: [Qemu-devel] [PATCH 06/13] convert pci bridge to qdev,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH 08/13] qdev: device free fixups., Gerd Hoffmann, 2009/09/22
[Qemu-devel] [PATCH 11/13] pci: use qdev for device destruction., Gerd Hoffmann, 2009/09/22
Re: [Qemu-devel] [PATCH 00/13] qdev: bus management updates., Markus Armbruster, 2009/09/24