From: Asias He <asias.hejun@gmail.com>
Date: Fri, 8 Apr 2011 16:10:06 +0000 (+0800)
Subject: kvm tools: Drop virt_queue__get_used_elem virtio helper
X-Git-Tag: next-20110824~3^2~471
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=885b8376629733d6ad736f81a389d473adc8598a;p=karo-tx-linux.git

kvm tools: Drop virt_queue__get_used_elem virtio helper

Use virt_queue__set_used_elem instead.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/include/kvm/virtio.h b/tools/kvm/include/kvm/virtio.h
index 075387da9365..9f892a1d0983 100644
--- a/tools/kvm/include/kvm/virtio.h
+++ b/tools/kvm/include/kvm/virtio.h
@@ -26,12 +26,6 @@ static inline struct vring_desc *virt_queue__get_desc(struct virt_queue *queue,
 	return &queue->vring.desc[desc_ndx];
 }
 
-static inline struct vring_used_elem *virt_queue__get_used_elem(struct virt_queue *queue)
-{
-	return &queue->vring.used->ring[queue->vring.used->idx++ % queue->vring.num];
-}
-
-
 static inline bool virt_queue__available(struct virt_queue *vq)
 {
 	return vq->vring.avail->idx !=  vq->last_avail_idx;
diff --git a/tools/kvm/virtio-blk.c b/tools/kvm/virtio-blk.c
index a41d5aca91e1..8351e7ada5f4 100644
--- a/tools/kvm/virtio-blk.c
+++ b/tools/kvm/virtio-blk.c
@@ -100,7 +100,6 @@ static bool virtio_blk_pci_io_in(struct kvm *self, uint16_t port, void *data, in
 
 static bool virtio_blk_request(struct kvm *self, struct virt_queue *queue)
 {
-	struct vring_used_elem *used_elem;
 	struct virtio_blk_outhdr *req;
 	uint16_t desc_block_last;
 	struct vring_desc *desc;
@@ -190,9 +189,7 @@ static bool virtio_blk_request(struct kvm *self, struct virt_queue *queue)
 
 	*status			= err_cnt ? VIRTIO_BLK_S_IOERR : VIRTIO_BLK_S_OK;
 
-	used_elem		= virt_queue__get_used_elem(queue);
-	used_elem->id		= desc_hdr;
-	used_elem->len		= block_cnt;
+	virt_queue__set_used_elem(queue, desc_hdr, block_cnt);
 
 	return true;
 }