clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-05 05:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Introduce virtio.c and virtio.h

Browse Source 
This patch moves common virtio code to virtio.c and virtio.h.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2015-06-01 16:39:41 +01:00
committed by Will Deacon
parent 802e07a053
commit 39d6af073d
6 changed files with 86 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -26,6 +26,7 @@ OBJS += mmio.o
OBJS += pci.o
OBJS += util.o
OBJS += term.o
OBJS += virtio.o
DEPS := $(patsubst %.o,%.d,$(OBJS))
blk-virtio.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "kvm/virtio_pci.h"
#include "kvm/disk-image.h"
#include "kvm/virtqueue.h"
#include "kvm/virtio.h"
#include "kvm/ioport.h"
#include "kvm/util.h"
#include "kvm/kvm.h"
console-virtio.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "kvm/console-virtio.h"
#include "kvm/virtio_pci.h"
#include "kvm/disk-image.h"
#include "kvm/virtqueue.h"
#include "kvm/virtio.h"
#include "kvm/ioport.h"
#include "kvm/util.h"
#include "kvm/term.h"
include/kvm/virtio.h
+44
View File
@@ -0,0 +1,44 @@
#ifndef KVM__VIRTIO_H
#define KVM__VIRTIO_H
#include <linux/virtio_ring.h>
#include <stdint.h>
#include <sys/uio.h>
#include "kvm/kvm.h"
struct virt_queue {
struct vring vring;
uint32_t pfn;
/* The last_avail_idx field is an index to ->ring of struct vring_avail.
It's where we assume the next request index is at. */
uint16_t last_avail_idx;
};
static inline uint16_t virt_queue__pop(struct virt_queue *queue)
{
return queue->vring.avail->ring[queue->last_avail_idx++ % queue->vring.num];
}
static inline struct vring_desc *virt_queue__get_desc(struct virt_queue *queue, uint16_t desc_ndx)
{
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;
}
struct vring_used_elem *virt_queue__set_used_elem(struct virt_queue *queue, uint32_t head, uint32_t len);
uint16_t virt_queue__get_iov(struct virt_queue *queue, struct iovec iov[], uint16_t *out, uint16_t *in, struct kvm *kvm);
#endif /* KVM__VIRTIO_H */
include/kvm/virtqueue.h
-73
View File
@@ -1,73 +0,0 @@
#ifndef KVM__VIRTQUEUE_H
#define KVM__VIRTQUEUE_H
#include <linux/virtio_ring.h>
#include <stdint.h>
#include <sys/uio.h>
#include "kvm/kvm.h"
struct virt_queue {
struct vring vring;
uint32_t pfn;
/* The last_avail_idx field is an index to ->ring of struct vring_avail.
It's where we assume the next request index is at. */
uint16_t last_avail_idx;
};
static inline uint16_t virt_queue__pop(struct virt_queue *queue)
{
return queue->vring.avail->ring[queue->last_avail_idx++ % queue->vring.num];
}
static inline struct vring_desc *virt_queue__get_desc(struct virt_queue *queue, uint16_t desc_ndx)
{
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 struct vring_used_elem *virt_queue__set_used_elem(struct virt_queue *queue, uint32_t head, uint32_t len)
{
struct vring_used_elem *used_elem;
used_elem = &queue->vring.used->ring[queue->vring.used->idx++ % queue->vring.num];
used_elem->id = head;
used_elem->len = len;
return used_elem;
}
static inline bool virt_queue__available(struct virt_queue *vq)
{
return vq->vring.avail->idx != vq->last_avail_idx;
}
static inline uint16_t virt_queue__get_iov(struct virt_queue *queue, struct iovec iov[], uint16_t *out, uint16_t *in, struct kvm *kvm)
{
struct vring_desc *desc;
uint16_t head, idx;
idx = head = virt_queue__pop(queue);
*out = *in = 0;
do {
desc = virt_queue__get_desc(queue, idx);
iov[*out + *in].iov_base = guest_flat_to_host(kvm, desc->addr);
iov[*out + *in].iov_len = desc->len;
if (desc->flags & VRING_DESC_F_WRITE)
(*in)++;
else
(*out)++;
if (desc->flags & VRING_DESC_F_NEXT)
idx = desc->next;
else
break;
} while (1);
return head;
}
#endif /* KVM__VIRTQUEUE_H */
virtio.c
+39
View File
@@ -0,0 +1,39 @@
#include <linux/virtio_ring.h>
#include <stdint.h>
#include <sys/uio.h>
#include "kvm/kvm.h"
#include "kvm/virtio.h"
struct vring_used_elem *virt_queue__set_used_elem(struct virt_queue *queue, uint32_t head, uint32_t len)
{
struct vring_used_elem *used_elem;
used_elem = &queue->vring.used->ring[queue->vring.used->idx++ % queue->vring.num];
used_elem->id = head;
used_elem->len = len;
return used_elem;
}
uint16_t virt_queue__get_iov(struct virt_queue *queue, struct iovec iov[], uint16_t *out, uint16_t *in, struct kvm *kvm)
{
struct vring_desc *desc;
uint16_t head, idx;
idx = head = virt_queue__pop(queue);
*out = *in = 0;
do {
desc = virt_queue__get_desc(queue, idx);
iov[*out + *in].iov_base = guest_flat_to_host(kvm, desc->addr);
iov[*out + *in].iov_len = desc->len;
if (desc->flags & VRING_DESC_F_WRITE)
(*in)++;
else
(*out)++;
if (desc->flags & VRING_DESC_F_NEXT)
idx = desc->next;
else
break;
} while (1);
return head;
}