[Qemu-devel] [6902] add qemu_iovec_init_external (Christoph Hellwig)

[Anthony Liguori]

Revision: 6902
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6902
Author:   aliguori
Date:     2009-03-28 17:46:10 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
add qemu_iovec_init_external (Christoph Hellwig)


Allow to initialize a QEMUIOVector from an externally allocated iovec.
qiov->nalloc is initialized to -1 to indicate external storage for qiov->iov
and all functions dealing with memory management assert on the iovec beeing
an internally managed first.


Signed-off-by: Christoph Hellwig <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/cutils.c
    trunk/qemu-common.h

Modified: trunk/cutils.c
===================================================================
--- trunk/cutils.c      2009-03-28 17:29:07 UTC (rev 6901)
+++ trunk/cutils.c      2009-03-28 17:46:10 UTC (rev 6902)
@@ -23,6 +23,7 @@
  */
 #include "qemu-common.h"
 #include "host-utils.h"
+#include <assert.h>
 
 void pstrcpy(char *buf, int buf_size, const char *str)
 {
@@ -112,8 +113,22 @@
     qiov->size = 0;
 }
 
+void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov)
+{
+    int i;
+
+    qiov->iov = iov;
+    qiov->niov = niov;
+    qiov->nalloc = -1;
+    qiov->size = 0;
+    for (i = 0; i < niov; i++)
+        qiov->size += iov[i].iov_len;
+}
+
 void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
 {
+    assert(qiov->nalloc != -1);
+
     if (qiov->niov == qiov->nalloc) {
         qiov->nalloc = 2 * qiov->nalloc + 1;
         qiov->iov = qemu_realloc(qiov->iov, qiov->nalloc * sizeof(struct 
iovec));
@@ -126,11 +141,15 @@
 
 void qemu_iovec_destroy(QEMUIOVector *qiov)
 {
+    assert(qiov->nalloc != -1);
+
     qemu_free(qiov->iov);
 }
 
 void qemu_iovec_reset(QEMUIOVector *qiov)
 {
+    assert(qiov->nalloc != -1);
+
     qiov->niov = 0;
     qiov->size = 0;
 }

Modified: trunk/qemu-common.h
===================================================================
--- trunk/qemu-common.h 2009-03-28 17:29:07 UTC (rev 6901)
+++ trunk/qemu-common.h 2009-03-28 17:46:10 UTC (rev 6902)
@@ -194,6 +194,7 @@
 } QEMUIOVector;
 
 void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint);
+void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov);
 void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
 void qemu_iovec_destroy(QEMUIOVector *qiov);
 void qemu_iovec_reset(QEMUIOVector *qiov);