From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Jason Wang <jasowang@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
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 [thread overview]
Message-ID: <1489600837-11541-7-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1489600837-11541-1-git-send-email-mst@redhat.com>
From: Jason Wang <jasowang@redhat.com>
This reverts commit
96a8821d21411f10d77ea994af369c6e5c35a2cc. Previous patch is a better
solution which does not require a strict order between virtio and IOMMU.
CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
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
next prev parent reply other threads:[~2017-03-15 18:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-15 18:01 [Qemu-devel] [PULL 0/7] virtio, pc: fixes Michael S. Tsirkin
2017-03-15 18:01 ` [Qemu-devel] [PULL 1/7] Bugfix: Handle error if VM Generation ID device not present Michael S. Tsirkin
2017-03-15 18:01 ` [Qemu-devel] [PULL 2/7] virtio: guard against NULL pfn Michael S. Tsirkin
2017-03-15 18:01 ` [Qemu-devel] [PULL 3/7] virtio: destroy region cache during reset Michael S. Tsirkin
2017-03-15 18:01 ` [Qemu-devel] [PULL 4/7] virtio: validate address space cache during init Michael S. Tsirkin
2017-03-15 18:01 ` [Qemu-devel] [PULL 5/7] pci: introduce a bus master container Michael S. Tsirkin
2017-03-24 9:38 ` Alexey Kardashevskiy
2017-03-15 18:01 ` Michael S. Tsirkin [this message]
2017-03-15 18:01 ` [Qemu-devel] [PULL 7/7] virtio-pci: reset modern vq meta data Michael S. Tsirkin
2017-03-15 19:40 ` [Qemu-devel] [PULL 0/7] virtio, pc: fixes Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1489600837-11541-7-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).