From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 9 Jul 2012 17:35:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'mjt/mjt-iov2' into staging
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~17^2~273
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23797df3d9f08031d19aaaa1d2863d5feebe3d8b;p=sdk%2Femulator%2Fqemu.git

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>
---

23797df3d9f08031d19aaaa1d2863d5feebe3d8b
diff --cc Makefile
index bad0e3142a,017836bc02..34d6a9e52c
--- a/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 tests/Makefile
index d66ab196a7,7340bc5044..d687ecce3f
--- a/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