diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2012-06-14 12:16:10 -0600 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@robin.(none)> | 2012-06-18 10:21:10 +0300 |
| commit | b2357c484d3b3e2afd305b71fb5bc0b0b8d61ca8 (patch) | |
| tree | ed8356a5fad1becc9f6dc947fb82972aaac6ab99 /hw/virtio-pci.c | |
| parent | 1116b5392129a9961335c2b64e63003736e3c2df (diff) | |
| download | focaccia-qemu-b2357c484d3b3e2afd305b71fb5bc0b0b8d61ca8.tar.gz focaccia-qemu-b2357c484d3b3e2afd305b71fb5bc0b0b8d61ca8.zip | |
virtio: Convert to msix_init_exclusive_bar() interface
Simple conversion. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 9342eed070..3dca37ff0c 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -782,13 +782,10 @@ void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev) pci_set_word(config + PCI_SUBSYSTEM_ID, vdev->device_id); config[PCI_INTERRUPT_PIN] = 1; - 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(&proxy->pci_dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, - &proxy->msix_bar); - } else + if (vdev->nvectors && + msix_init_exclusive_bar(&proxy->pci_dev, vdev->nvectors, 1)) { vdev->nvectors = 0; + } proxy->pci_dev.config_write = virtio_write_config; @@ -834,12 +831,10 @@ 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); - r = msix_uninit(pci_dev, &proxy->msix_bar); - memory_region_destroy(&proxy->msix_bar); - return r; + msix_uninit_exclusive_bar(pci_dev); + return 0; } static int virtio_blk_exit_pci(PCIDevice *pci_dev) |