Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into...

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 <[email protected]>"
# gpg:                 aka "Daniel P. Berrange <[email protected]>"

* 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 <[email protected]>

diff --cc tests/test-io-channel-file.c
index c5d3d3c251bd51f2b59b3ae3983e4af0e8de9e68,45e699044c26134e2b17ece6182d3d57e1609f53..1e7f3c7f125da33acdb125deb4bccc4bc9b72548
--- 1/tests/test-io-channel-file.c
--- 2/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 f0872b26f20853c7f0940c1336bb54784091e86f,e28e40fd9445624be13e5f48c5c0ca9d52553eda..069736373c3096c1eee082e9518c23bb18446bc1
--- 1/tests/test-io-channel-socket.c
--- 2/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 <ifaddrs.h>