qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Jason Wang <jasowang@redhat.com>,
	qemu-stable@nongnu.org
Subject: [Qemu-devel] [PULL 7/7] virtio-pci: reset modern vq meta data
Date: Wed, 15 Mar 2017 20:01:44 +0200	[thread overview]
Message-ID: <1489600837-11541-8-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>

We don't reset proxy->vqs[].{num|desc[]|avail[]|used[]}. This means if
a driver enable the vq without setting vq address after reset. The old
addresses were leaked. Fixing this by resetting modern vq meta data
during device reset.

Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/virtio-pci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 5ce42af..69cc471 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1857,6 +1857,10 @@ static void virtio_pci_reset(DeviceState *qdev)
 
     for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
         proxy->vqs[i].enabled = 0;
+        proxy->vqs[i].num = 0;
+        proxy->vqs[i].desc[0] = proxy->vqs[i].desc[1] = 0;
+        proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
+        proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;
     }
 }
 
-- 
MST

  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 ` [Qemu-devel] [PULL 6/7] Revert "virtio: unbreak virtio-pci with IOMMU after caching ring translations" Michael S. Tsirkin
2017-03-15 18:01 ` Michael S. Tsirkin [this message]
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-8-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@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).