[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/15] virtio: unbreak virtio-pci with IOMMU after ca
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/15] virtio: unbreak virtio-pci with IOMMU after caching ring translations |
Date: |
Thu, 2 Mar 2017 08:20:49 +0200 |
From: Jason Wang <address@hidden>
Commit c611c76417f5 ("virtio: add MemoryListener to cache ring
translations") registers a memory listener to dma_as. This may not
work when IOMMU is enabled: dma_as(bus_master_as) were initialized in
pcibus_machine_done() after virtio_realize(). This will cause a
segfault. Fixing this by using pci_device_iommu_address_space()
instead to make sure address space were initialized at this time.
With this fix, IOMMU device were required to be initialized before any
virtio-pci devices.
Fixes: c611c76417f5 ("virtio: add MemoryListener to cache ring translations")
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <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 5ce42af..b76f3f6 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_get_address_space(dev);
+ return pci_device_iommu_address_space(dev);
}
static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
--
MST
- Re: [Qemu-devel] [PULL 05/15] qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands, (continued)
[Qemu-devel] [PULL 04/15] ACPI: Add Virtual Machine Generation ID support, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 07/15] MAINTAINERS: Add VM Generation ID entries, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 06/15] tests: Move reusable ACPI code into a utility file, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 08/15] virtio: check for vring setup in virtio_queue_empty, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 10/15] virtio: invalidate memory in vring_set_avail_event(), Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 09/15] virtio: guard vring access when setting notification, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 11/15] virtio: add missing region cache init in virtio_load(), Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 12/15] virtio: unbreak virtio-pci with IOMMU after caching ring translations,
Michael S. Tsirkin <=
[Qemu-devel] [PULL 14/15] tests/acpi: update DSDT after last patch, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 13/15] acpi: simplify _OSC, Michael S. Tsirkin, 2017/03/02
[Qemu-devel] [PULL 15/15] hw/pxb-pcie: fix PCI Express hotplug support, Michael S. Tsirkin, 2017/03/02
Re: [Qemu-devel] [PULL 00/15] virtio, pc: fixes, features, Peter Maydell, 2017/03/02
Re: [Qemu-devel] [PULL 00/15] virtio, pc: fixes, features, Peter Maydell, 2017/03/03
Re: [Qemu-devel] [PULL 00/15] virtio, pc: fixes, features, Peter Maydell, 2017/03/03