[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] Revert "virtio: unbreak virtio-pci with IOMMU af
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 6/7] Revert "virtio: unbreak virtio-pci with IOMMU after caching ring translations" |
Date: |
Wed, 15 Mar 2017 20:01:42 +0200 |
From: Jason Wang <address@hidden>
This reverts commit
96a8821d21411f10d77ea994af369c6e5c35a2cc. Previous patch is a better
solution which does not require a strict order between virtio and IOMMU.
CC: Paolo Bonzini <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/virtio/virtio-pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index b76f3f6..5ce42af 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1153,7 +1153,7 @@ static AddressSpace *virtio_pci_get_dma_as(DeviceState *d)
VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
PCIDevice *dev = &proxy->pci_dev;
- return pci_device_iommu_address_space(dev);
+ return pci_get_address_space(dev);
}
static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
--
MST
- [Qemu-devel] [PULL 0/7] virtio, pc: fixes, Michael S. Tsirkin, 2017/03/15
- [Qemu-devel] [PULL 2/7] virtio: guard against NULL pfn, Michael S. Tsirkin, 2017/03/15
- [Qemu-devel] [PULL 1/7] Bugfix: Handle error if VM Generation ID device not present, Michael S. Tsirkin, 2017/03/15
- [Qemu-devel] [PULL 3/7] virtio: destroy region cache during reset, Michael S. Tsirkin, 2017/03/15
- [Qemu-devel] [PULL 4/7] virtio: validate address space cache during init, Michael S. Tsirkin, 2017/03/15
- [Qemu-devel] [PULL 6/7] Revert "virtio: unbreak virtio-pci with IOMMU after caching ring translations",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 5/7] pci: introduce a bus master container, Michael S. Tsirkin, 2017/03/15
- [Qemu-devel] [PULL 7/7] virtio-pci: reset modern vq meta data, Michael S. Tsirkin, 2017/03/15
- Re: [Qemu-devel] [PULL 0/7] virtio, pc: fixes, Peter Maydell, 2017/03/15