Commit 23797df3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mjt/mjt-iov2' into staging 



* mjt/mjt-iov2:
  rewrite iov_send_recv() and move it to iov.c
  cleanup qemu_co_sendv(), qemu_co_recvv() and friends
  export iov_send_recv() and use it in iov_send() and iov_recv()
  rename qemu_sendv to iov_send, change proto and move declarations to iov.h
  change qemu_iovec_to_buf() to match other to,from_buf functions
  consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
  allow qemu_iovec_from_buffer() to specify offset from which to start copying
  consolidate qemu_iovec_memset{,_skip}() into single function and use existing iov_memset()
  rewrite iov_* functions
  change iov_* function prototypes to be more appropriate
  virtio-serial-bus: use correct lengths in control_out() message

Conflicts:
	tests/Makefile

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 3f6e9a5f 25e5e4c7

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) qemu-timer-comm 
qemu-img.o: qemu-img-cmds.h



tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \

	qemu-timer-common.o main-loop.o notify.o iohandler.o cutils.o async.o

	qemu-timer-common.o main-loop.o notify.o \

	iohandler.o cutils.o iov.o async.o

tools-obj-$(CONFIG_POSIX) += compatfd.o



qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)

Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o 
#######################################################################

# block-obj-y is code used by both qemu system emulation and qemu-img



block-obj-y = cutils.o cache-utils.o qemu-option.o module.o async.o

block-obj-y = cutils.o iov.o cache-utils.o qemu-option.o module.o async.o

block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o

block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)

block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
@@ -101,7 +101,7 @@ common-obj-$(CONFIG_SLIRP) += slirp/ 
user-obj-y =

user-obj-y += envlist.o path.o

user-obj-y += tcg-runtime.o host-utils.o

user-obj-y += cutils.o cache-utils.o

user-obj-y += cutils.o iov.o cache-utils.o

user-obj-y += module.o

user-obj-y += qemu-user.o

user-obj-y += $(trace-obj-y)

block.c

+6 −6
Original line number Diff line number Diff line
@@ -1871,7 +1871,7 @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BlockDriverState *bs, 
    }



    skip_bytes = (sector_num - cluster_sector_num) * BDRV_SECTOR_SIZE;

    qemu_iovec_from_buffer(qiov, bounce_buffer + skip_bytes,

    qemu_iovec_from_buf(qiov, 0, bounce_buffer + skip_bytes,

                        nb_sectors * BDRV_SECTOR_SIZE);



err:
@@ -3200,13 +3200,13 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, 
            // Add the first request to the merged one. If the requests are

            // overlapping, drop the last sectors of the first request.

            size = (reqs[i].sector - reqs[outidx].sector) << 9;

            qemu_iovec_concat(qiov, reqs[outidx].qiov, size);

            qemu_iovec_concat(qiov, reqs[outidx].qiov, 0, size);



            // We should need to add any zeros between the two requests

            assert (reqs[i].sector <= oldreq_last);



            // Add the second request

            qemu_iovec_concat(qiov, reqs[i].qiov, reqs[i].qiov->size);

            qemu_iovec_concat(qiov, reqs[i].qiov, 0, reqs[i].qiov->size);



            reqs[outidx].nb_sectors = qiov->size >> 9;

            reqs[outidx].qiov = qiov;
@@ -3481,7 +3481,7 @@ static void bdrv_aio_bh_cb(void *opaque) 
    BlockDriverAIOCBSync *acb = opaque;



    if (!acb->is_write)

        qemu_iovec_from_buffer(acb->qiov, acb->bounce, acb->qiov->size);

        qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);

    qemu_vfree(acb->bounce);

    acb->common.cb(acb->common.opaque, acb->ret);

    qemu_bh_delete(acb->bh);
@@ -3507,7 +3507,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, 
    acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);



    if (is_write) {

        qemu_iovec_to_buffer(acb->qiov, acb->bounce);

        qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);

        acb->ret = bs->drv->bdrv_write(bs, sector_num, acb->bounce, nb_sectors);

    } else {

        acb->ret = bs->drv->bdrv_read(bs, sector_num, acb->bounce, nb_sectors);

block/curl.c

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque) 
            continue;



        if ((s->buf_off >= acb->end)) {

            qemu_iovec_from_buffer(acb->qiov, s->orig_buf + acb->start,

            qemu_iovec_from_buf(acb->qiov, 0, s->orig_buf + acb->start,

                                acb->end - acb->start);

            acb->common.cb(acb->common.opaque, 0);

            qemu_aio_release(acb);
@@ -176,7 +176,7 @@ static int curl_find_buf(BDRVCURLState *s, size_t start, size_t len, 
        {

            char *buf = state->orig_buf + (start - state->buf_start);



            qemu_iovec_from_buffer(acb->qiov, buf, len);

            qemu_iovec_from_buf(acb->qiov, 0, buf, len);

            acb->common.cb(acb->common.opaque, 0);



            return FIND_RET_OK;

block/iscsi.c

+1 −2
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, 
    /* this will allow us to get rid of 'buf' completely */

    size = nb_sectors * BDRV_SECTOR_SIZE;

    acb->buf = g_malloc(size);

    qemu_iovec_to_buffer(acb->qiov, acb->buf);



    qemu_iovec_to_buf(acb->qiov, 0, acb->buf, size);



    acb->task = malloc(sizeof(struct scsi_task));

    if (acb->task == NULL) {