diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:50:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:50:33 -0500 |
| commit | 6929cf11bb8ec5ff9f9e76c870c513204854a1eb (patch) | |
| tree | 8514562aa6181fd29f559f804244dc48615cf280 /hw/virtio.h | |
| parent | 938406dfb11d8a40d9228b3596d49a583d7218ff (diff) | |
| parent | ad3005ad8c70a69705149d3ce6d1e51fb76edb15 (diff) | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony:
virtio-serial-bus: let chardev know the exact number of bytes requested
virtio: Introduce virtqueue_get_avail_bytes()
virtio: use unsigned int for counting bytes in vq
iov: add const annotation
virtio-net: fix used len for tx
virtio: don't mark unaccessed memory as dirty
Diffstat (limited to 'hw/virtio.h')
| -rw-r--r-- | hw/virtio.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/virtio.h b/hw/virtio.h index 7a4f564529..80de3757e3 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -147,7 +147,10 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, void virtqueue_map_sg(struct iovec *sg, target_phys_addr_t *addr, size_t num_sg, int is_write); int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem); -int virtqueue_avail_bytes(VirtQueue *vq, int in_bytes, int out_bytes); +int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes, + unsigned int out_bytes); +void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, + unsigned int *out_bytes); void virtio_notify(VirtIODevice *vdev, VirtQueue *vq); |