[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 12/17] iov: Add iov_to_buf and iov_size helpers
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH v5 12/17] iov: Add iov_to_buf and iov_size helpers |
Date: |
Wed, 14 Apr 2010 10:58:32 +0530 |
iov_to_buf() puts the buffer contents in the iov in a linearized buffer.
iov_size() gets the length of the contents in the iov.
The iov_to_buf() function is the memcpy_to_iovec() function that was
used in virtio-ballon.c.
Signed-off-by: Amit Shah <address@hidden>
---
hw/iov.c | 37 +++++++++++++++++++++++++++++++++++++
hw/iov.h | 3 +++
hw/virtio-balloon.c | 35 ++++-------------------------------
3 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/hw/iov.c b/hw/iov.c
index 07bd499..588cd04 100644
--- a/hw/iov.c
+++ b/hw/iov.c
@@ -31,3 +31,40 @@ size_t iov_from_buf(struct iovec *iov, unsigned int iovcnt,
}
return offset;
}
+
+size_t iov_to_buf(const struct iovec *iov, const unsigned int iovcnt,
+ void *buf, size_t offset, size_t size)
+{
+ uint8_t *ptr;
+ size_t iov_off, buf_off;
+ unsigned int i;
+
+ ptr = buf;
+ iov_off = 0;
+ buf_off = 0;
+ for (i = 0; i < iovcnt && size; i++) {
+ if (offset < (iov_off + iov[i].iov_len)) {
+ size_t len = MIN((iov_off + iov[i].iov_len) - offset , size);
+
+ memcpy(ptr + buf_off, iov[i].iov_base + (offset - iov_off), len);
+
+ buf_off += len;
+ offset += len;
+ size -= len;
+ }
+ iov_off += iov[i].iov_len;
+ }
+ return buf_off;
+}
+
+size_t iov_size(const struct iovec *iov, const unsigned int iovcnt)
+{
+ size_t len;
+ unsigned int i;
+
+ len = 0;
+ for (i = 0; i < iovcnt; i++) {
+ len += iov[i].iov_len;
+ }
+ return len;
+}
diff --git a/hw/iov.h b/hw/iov.h
index 5e3e541..60a8547 100644
--- a/hw/iov.h
+++ b/hw/iov.h
@@ -14,3 +14,6 @@
size_t iov_from_buf(struct iovec *iov, unsigned int iovcnt,
const void *buf, size_t size);
+size_t iov_to_buf(const struct iovec *iov, const unsigned int iovcnt,
+ void *buf, size_t offset, size_t size);
+size_t iov_size(const struct iovec *iov, const unsigned int iovcnt);
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index f55f7ec..152af80 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -11,6 +11,7 @@
*
*/
+#include "iov.h"
#include "qemu-common.h"
#include "virtio.h"
#include "pc.h"
@@ -92,33 +93,6 @@ static QObject *get_stats_qobject(VirtIOBalloon *dev)
return QOBJECT(dict);
}
-/* FIXME: once we do a virtio refactoring, this will get subsumed into common
- * code */
-static size_t memcpy_from_iovector(void *data, size_t offset, size_t size,
- struct iovec *iov, int iovlen)
-{
- int i;
- uint8_t *ptr = data;
- size_t iov_off = 0;
- size_t data_off = 0;
-
- for (i = 0; i < iovlen && size; i++) {
- if (offset < (iov_off + iov[i].iov_len)) {
- size_t len = MIN((iov_off + iov[i].iov_len) - offset , size);
-
- memcpy(ptr + data_off, iov[i].iov_base + (offset - iov_off), len);
-
- data_off += len;
- offset += len;
- size -= len;
- }
-
- iov_off += iov[i].iov_len;
- }
-
- return data_off;
-}
-
static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
{
VirtIOBalloon *s = to_virtio_balloon(vdev);
@@ -128,8 +102,7 @@ static void virtio_balloon_handle_output(VirtIODevice
*vdev, VirtQueue *vq)
size_t offset = 0;
uint32_t pfn;
- while (memcpy_from_iovector(&pfn, offset, 4,
- elem.out_sg, elem.out_num) == 4) {
+ while (iov_to_buf(elem.out_sg, elem.out_num, &pfn, offset, 4) == 4) {
ram_addr_t pa;
ram_addr_t addr;
@@ -181,8 +154,8 @@ static void virtio_balloon_receive_stats(VirtIODevice
*vdev, VirtQueue *vq)
*/
reset_stats(s);
- while (memcpy_from_iovector(&stat, offset, sizeof(stat), elem->out_sg,
- elem->out_num) == sizeof(stat)) {
+ while (iov_to_buf(elem->out_sg, elem->out_num, &stat, offset, sizeof(stat))
+ == sizeof(stat)) {
uint16_t tag = tswap16(stat.tag);
uint64_t val = tswap64(stat.val);
--
1.6.2.5
- [Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports on src and dest are same., (continued)
- [Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports on src and dest are same., Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 03/17] virtio-serial: save/load: Ensure we have hot-plugged ports instantiated, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 04/17] virtio-serial: save/load: Send target host connection status if different, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 05/17] virtio-serial: Use control messages to notify guest of new ports, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 06/17] virtio-serial: whitespace: match surrounding code, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 07/17] virtio-serial: Remove redundant check for 0-sized write request, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 08/17] virtio-serial: Update copyright year to 2010, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 09/17] virtio-serial: Propagate errors in initialising ports / devices in guest, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 10/17] virtio-serial: Send out guest data to ports only if port is opened, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 11/17] iov: Introduce a new file for helpers around iovs, add iov_from_buf(), Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 12/17] iov: Add iov_to_buf and iov_size helpers,
Amit Shah <=
- [Qemu-devel] [PATCH v5 13/17] virtio-serial: Handle scatter-gather buffers for control messages, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 14/17] virtio-serial: Handle scatter/gather input from the guest, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 15/17] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 16/17] virtio-serial: Discard data that guest sends us when ports aren't connected, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 17/17] virtio-serial: Implement flow control for individual ports, Amit Shah, 2010/04/14
[Qemu-devel] Re: [PATCH v5 00/17] virtio-serial fixes, new abi for port discovery, flow control, Juan Quintela, 2010/04/14