From 885b8376629733d6ad736f81a389d473adc8598a Mon Sep 17 00:00:00 2001 From: Asias He Date: Sat, 9 Apr 2011 00:10:06 +0800 Subject: [PATCH] kvm tools: Drop virt_queue__get_used_elem virtio helper Use virt_queue__set_used_elem instead. Signed-off-by: Asias He Signed-off-by: Pekka Enberg --- tools/kvm/include/kvm/virtio.h | 6 ------ tools/kvm/virtio-blk.c | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) 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; } -- 2.39.5