From: Peter Maydell Date: Tue, 16 Feb 2016 15:47:35 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into... X-Git-Tag: qemu-xen-4.8.0-rc1~462 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=250f53ddaac3211990fb20ced3c46d2338e195e3;p=qemu-xen.git Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into staging Merge I/O fixes 2016/02/16 v1 # gpg: Signature made Tue 16 Feb 2016 15:42:29 GMT using RSA key ID 15104FDF # gpg: Good signature from "Daniel P. Berrange " # gpg: aka "Daniel P. Berrange " * remotes/berrange/tags/pull-io-next-2016-02-16-1: io: convert QIOChannelBuffer to use uint8_t instead of char io: introduce helper for creating channels from file descriptors io: improve docs for QIOChannelSocket async functions Signed-off-by: Peter Maydell --- 250f53ddaac3211990fb20ced3c46d2338e195e3 diff --cc tests/test-io-channel-file.c index c5d3d3c251,45e699044c..1e7f3c7f12 --- a/tests/test-io-channel-file.c +++ b/tests/test-io-channel-file.c @@@ -18,8 -18,8 +18,9 @@@ * */ +#include "qemu/osdep.h" #include "io/channel-file.h" + #include "io/channel-util.h" #include "io-channel-helpers.h" diff --cc tests/test-io-channel-socket.c index f0872b26f2,e28e40fd94..069736373c --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@@ -18,8 -18,8 +18,9 @@@ * */ +#include "qemu/osdep.h" #include "io/channel-socket.h" + #include "io/channel-util.h" #include "io-channel-helpers.h" #ifdef HAVE_IFADDRS_H #include