From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 02/15] virtio: introduce virtqueue_discard()
Date: Fri, 2 Oct 2015 16:45:06 +0300 [thread overview]
Message-ID: <1443793405-15190-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1443793405-15190-1-git-send-email-mst@redhat.com>
From: Jason Wang <jasowang@redhat.com>
This patch introduces virtqueue_discard() to discard a descriptor and
unmap the sgs. This will be used by the patch that will discard
descriptor when packet is truncated.
Cc: Michael S. Tsirkin <mst@redhat.com>
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>
---
include/hw/virtio/virtio.h | 2 ++
hw/virtio/virtio.c | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 6201ee8..9d09115 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -146,6 +146,8 @@ void virtio_del_queue(VirtIODevice *vdev, int n);
void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len);
void virtqueue_flush(VirtQueue *vq, unsigned int count);
+void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len);
void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len, unsigned int idx);
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 6f2b96c..d0bc72e 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -267,6 +267,13 @@ static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
0, elem->out_sg[i].iov_len);
}
+void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len)
+{
+ vq->last_avail_idx--;
+ virtqueue_unmap_sg(vq, elem, len);
+}
+
void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len, unsigned int idx)
{
--
MST
next prev parent reply other threads:[~2015-10-02 13:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-02 13:44 [Qemu-devel] [PULL 00/15] virtio,pc features, fixes Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 01/15] virtio: introduce virtqueue_unmap_sg() Michael S. Tsirkin
2015-10-02 13:45 ` Michael S. Tsirkin [this message]
2015-10-02 13:45 ` [Qemu-devel] [PULL 03/15] virtio-net: correctly drop truncated packets Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 04/15] oslib: rework anonimous RAM allocation Michael S. Tsirkin
2015-10-02 14:18 ` Eric Blake
2015-10-02 13:45 ` [Qemu-devel] [PULL 05/15] oslib: allocate PROT_NONE pages on top of RAM Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 06/15] exec: " Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 07/15] pc: Add a comment explaining why pc_compat_2_4() doesn't exist Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 08/15] virtio: Notice when the system doesn't support MSIx at all Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 09/15] virtio-9p: migrate virtio subsections Michael S. Tsirkin
2015-10-02 14:05 ` Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 10/15] vhost-user-test: do not reinvent glib-compat.h Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 11/15] vhost-user: unit test for new messages Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 12/15] memhp: extend address auto assignment to support gaps Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 13/15] pc: memhp: force gaps between DIMM's GPA Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 14/15] vhost-user-test: use tmpfs by default Michael S. Tsirkin
2015-10-05 22:39 ` Peter Maydell
2015-10-05 23:04 ` Michael S. Tsirkin
2015-10-05 23:17 ` Michael S. Tsirkin
2015-10-06 8:41 ` Peter Maydell
2015-10-06 11:07 ` Peter Maydell
2015-10-14 14:01 ` Marc-André Lureau
2015-10-02 13:46 ` [Qemu-devel] [PULL 15/15] vhost-user-test: fix predictable filename on tmpfs Michael S. Tsirkin
2015-10-02 14:06 ` [Qemu-devel] [PULL 00/15] virtio,pc features, fixes Michael S. Tsirkin
2015-10-02 16:06 ` Eric Blake
2015-10-02 16:27 ` 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=1443793405-15190-3-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=jasowang@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).