virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: rusty@rustcorp.com.au, virtualization@lists.linux-foundation.org
Subject: [PATCH 4/6] virtio_blk: use virtqueue_xxx wrappers
Date: Mon, 12 Apr 2010 16:18:36 +0300	[thread overview]
Message-ID: <3e5d10567ba12636cbbb397292cdc8508f2a81a3.1271078235.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1271078235.git.mst@redhat.com>

Switch virtio_blk to new virtqueue_xxx wrappers.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/block/virtio_blk.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 2138a7a..1fb4f20 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -50,7 +50,7 @@ static void blk_done(struct virtqueue *vq)
 	unsigned long flags;
 
 	spin_lock_irqsave(&vblk->lock, flags);
-	while ((vbr = vblk->vq->vq_ops->get_buf(vblk->vq, &len)) != NULL) {
+	while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) {
 		int error;
 
 		switch (vbr->status) {
@@ -151,7 +151,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,
 		}
 	}
 
-	if (vblk->vq->vq_ops->add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) {
+	if (virtqueue_add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) {
 		mempool_free(vbr, vblk->pool);
 		return false;
 	}
@@ -180,7 +180,7 @@ static void do_virtblk_request(struct request_queue *q)
 	}
 
 	if (issued)
-		vblk->vq->vq_ops->kick(vblk->vq);
+		virtqueue_kick(vblk->vq);
 }
 
 static void virtblk_prepare_flush(struct request_queue *q, struct request *req)
-- 
1.7.0.2.280.gc6f05

  parent reply	other threads:[~2010-04-12 13:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-12 13:18 [PATCH 0/6] virtio: virtqueue ops cleanup Michael S. Tsirkin
2010-04-12 13:18 ` [PATCH 1/6] virtio: add virtqueue_ vq_ops wrappers Michael S. Tsirkin
2010-04-12 13:18 ` [PATCH 2/6] virtio_balloon: use virtqueue_xxx wrappers Michael S. Tsirkin
2010-04-12 13:18 ` [PATCH 3/6] virtio_console: " Michael S. Tsirkin
2010-04-12 13:18 ` Michael S. Tsirkin [this message]
2010-04-12 13:19 ` [PATCH 5/6] virtio_net: " Michael S. Tsirkin
2010-04-12 13:19 ` [PATCH 6/6] virtio_ring: remove a level of indirection Michael S. Tsirkin
2010-04-13 13:06 ` [PATCH 0/6] virtio: virtqueue ops cleanup Michael S. Tsirkin
2010-04-13 13:11   ` [PATCH] virtio-rng: use virtqueue_xxx wrappers Michael S. Tsirkin
2010-04-13 13:11   ` [PATCH] trans_virtio: " Michael S. Tsirkin
2010-04-20  9:10     ` Rusty Russell
2010-04-19 20:49 ` [PATCH 0/6] virtio: virtqueue ops cleanup Michael S. Tsirkin

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=3e5d10567ba12636cbbb397292cdc8508f2a81a3.1271078235.git.mst@redhat.com \
    --to=mst@redhat.com \
    --cc=rusty@rustcorp.com.au \
    --cc=virtualization@lists.linux-foundation.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).