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: Anthony Liguori <aliguori@us.ibm.com>

diff --cc Makefile
index bad0e3142a6de930b171dbbcec1f0ae97e87ad0a,017836bc025edf1328b842af93c99e9b990b3ee1..34d6a9e52c52a1f54c0da203558f670b1a6c9484
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -154,9 -151,11 +154,10 @@@ vscclient$(EXESUF): $(libcacard-y) $(os
  ######################################################################
  
  qemu-img.o: qemu-img-cmds.h
 -qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o qemu-ga.o: $(GENERATED_HEADERS)
  
  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)

diff --cc Makefile.objs
Simple merge

diff --cc block.c
Simple merge

diff --cc block/iscsi.c
Simple merge

diff --cc block/qcow2.c
Simple merge

diff --cc block/qed.c
Simple merge

diff --cc block/rbd.c
Simple merge

diff --cc block/sheepdog.c
Simple merge

diff --cc hw/rtl8139.c
Simple merge

diff --cc hw/usb/core.c
Simple merge

diff --cc hw/virtio-balloon.c
Simple merge

diff --cc hw/virtio-serial-bus.c
Simple merge

diff --cc qemu-common.h
Simple merge

diff --cc tests/Makefile
index d66ab196a7448d6a490f95e543fe508aa3888e94,7340bc5044cc2d12fde446dcb041d802c61a6cce..d687ecce3f495375ef75d9a4eb5a958b9b5dd10b
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -13,7 -13,7 +13,8 @@@ check-unit-y += tests/test-qmp-commands
  check-unit-y += tests/test-string-input-visitor$(EXESUF)
  check-unit-y += tests/test-string-output-visitor$(EXESUF)
  check-unit-y += tests/test-coroutine$(EXESUF)
 +check-unit-y += tests/test-visitor-serialization$(EXESUF)
+ check-unit-y += tests/test-iov$(EXESUF)
  
  check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh