Commit-ID: 8f2606f60a91d8adf1c834439e4a6b94a51269dc Gitweb: http://git.kernel.org/tip/8f2606f60a91d8adf1c834439e4a6b94a51269dc Author: Will Deacon <will.deacon@xxxxxxx> AuthorDate: Tue, 4 Feb 2014 16:53:49 +0000 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Sun, 16 Feb 2014 21:52:41 +0200 kvm tools: pci: register virtio pba structure as mmio region with kvm Despite allocating and providing code to handle accesses to the pba structure, virtio msix blocks in fact only register the msix table with kvm. This patch fixes the MMIO region so that it includes the pba structure for msix io blocks of virtio pci devices. The corresponding BAR is also updated to advertise the full size of the io block. Cc: Sasha Levin <sasha.levin@xxxxxxxxxx> Signed-off-by: Will Deacon <will.deacon@xxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/virtio/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/virtio/pci.c b/tools/kvm/virtio/pci.c index bb6e7c4..91010ca 100644 --- a/tools/kvm/virtio/pci.c +++ b/tools/kvm/virtio/pci.c @@ -322,7 +322,7 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, return r; vpci->base_addr = (u16)r; - r = kvm__register_mmio(kvm, vpci->msix_io_block, PCI_IO_SIZE, false, + r = kvm__register_mmio(kvm, vpci->msix_io_block, PCI_IO_SIZE * 2, false, virtio_pci__mmio_callback, vpci); if (r < 0) goto free_ioport; @@ -344,7 +344,7 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, .status = cpu_to_le16(PCI_STATUS_CAP_LIST), .capabilities = (void *)&vpci->pci_hdr.msix - (void *)&vpci->pci_hdr, .bar_size[0] = IOPORT_SIZE, - .bar_size[1] = PCI_IO_SIZE, + .bar_size[1] = PCI_IO_SIZE * 2, .bar_size[3] = PCI_IO_SIZE, }; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|