Commit 519661ee authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

util: add return value to qemu_iovec_concat_iov 



This will be necessary later to recognize the case where a
request has both dataout and datain.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1016b239

include/qemu-common.h

+3 −3
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ 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_concat(QEMUIOVector *dst,

                       QEMUIOVector *src, size_t soffset, size_t sbytes);

void qemu_iovec_concat_iov(QEMUIOVector *dst,

size_t qemu_iovec_concat_iov(QEMUIOVector *dst,

                             struct iovec *src_iov, unsigned int src_cnt,

                             size_t soffset, size_t sbytes);

bool qemu_iovec_is_zero(QEMUIOVector *qiov);

util/iov.c

+6 −4
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len) 
 * of src".

 * Only vector pointers are processed, not the actual data buffers.

 */

void qemu_iovec_concat_iov(QEMUIOVector *dst,

size_t qemu_iovec_concat_iov(QEMUIOVector *dst,

                             struct iovec *src_iov, unsigned int src_cnt,

                             size_t soffset, size_t sbytes)

{
@@ -303,7 +303,7 @@ void qemu_iovec_concat_iov(QEMUIOVector *dst, 
    size_t done;



    if (!sbytes) {

        return;

        return 0;

    }

    assert(dst->nalloc != -1);

    for (i = 0, done = 0; done < sbytes && i < src_cnt; i++) {
@@ -317,6 +317,8 @@ void qemu_iovec_concat_iov(QEMUIOVector *dst, 
        }

    }

    assert(soffset == 0); /* offset beyond end of src */



    return done;

}



/*