diff options
| author | Avi Kivity <avi@redhat.com> | 2011-08-08 16:09:26 +0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-08 10:22:30 -0500 |
| commit | 95524ae8dc8f06da0d6ba37703038238e3b27066 (patch) | |
| tree | 9b050ccb65a7cb8a65f3746aaec401304a996ce9 /hw/virtio-pci.c | |
| parent | de00982e9e14e2d6ba3d148f02c5a1e94deaa985 (diff) | |
| download | qemu-95524ae8dc8f06da0d6ba37703038238e3b27066.zip qemu-95524ae8dc8f06da0d6ba37703038238e3b27066.tar.gz qemu-95524ae8dc8f06da0d6ba37703038238e3b27066.tar.bz2 | |
msix: convert to memory API
The msix table is defined as a subregion, to allow for a BAR that
mixes device specific regions with the msix table.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 86c3229..95203c8 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -641,11 +641,12 @@ void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev) pci_set_word(config + 0x2e, vdev->device_id); config[0x3d] = 1; - if (vdev->nvectors && !msix_init(&proxy->pci_dev, vdev->nvectors, 1, 0)) { - pci_register_bar(&proxy->pci_dev, 1, - msix_bar_size(&proxy->pci_dev), - PCI_BASE_ADDRESS_SPACE_MEMORY, - msix_mmio_map); + memory_region_init(&proxy->msix_bar, "virtio-msix", 4096); + if (vdev->nvectors && !msix_init(&proxy->pci_dev, vdev->nvectors, + &proxy->msix_bar, 1, 0)) { + pci_register_bar_region(&proxy->pci_dev, 1, + PCI_BASE_ADDRESS_SPACE_MEMORY, + &proxy->msix_bar); } else vdev->nvectors = 0; @@ -694,9 +695,12 @@ static int virtio_blk_init_pci(PCIDevice *pci_dev) static int virtio_exit_pci(PCIDevice *pci_dev) { VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + int r; memory_region_destroy(&proxy->bar); - return msix_uninit(pci_dev); + r = msix_uninit(pci_dev, &proxy->msix_bar); + memory_region_destroy(&proxy->msix_bar); + return r; } static int virtio_blk_exit_pci(PCIDevice *pci_dev) |