The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e:
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging (2016-03-10 02:51:14 +0000) are available in the git repository at: git://github.com/berrange/qemu tags/pull-io-win32-2016-03-11-1 for you to fetch changes up to b16a44e13e89ee397a3d9a9e3cfa1605c3c1dc68: osdep: remove use of socket_error() from all code (2016-03-10 17:19:34 +0000) ---------------------------------------------------------------- Merge I/O fixes for win32 ---------------------------------------------------------------- Daniel P. Berrange (15): osdep: fix socket_error() to work with Mingw64 io: use bind() to check for IPv4/6 availability io: initialize sockets in test program io: bind to socket before creating QIOChannelSocket io: wait for incoming client in socket test io: set correct error object in background reader test thread io: assert errors before asserting content in I/O test io: fix copy+paste mistake in socket error message io: use qemu_accept to ensure SOCK_CLOEXEC is set io: remove checking of EWOULDBLOCK char: remove qemu_chr_finish_socket_connection method char: remove socket_try_connect method char: remove qemu_chr_open_socket_fd method osdep: add wrappers for socket functions osdep: remove use of socket_error() from all code Paolo Bonzini (3): io: pass HANDLE to g_source_add_poll on Win32 io: introduce qio_channel_create_socket_watch io: implement socket watch for win32 using WSAEventSelect+select Makefile | 4 +- block/sheepdog.c | 5 +- include/io/channel-watch.h | 20 ++- include/io/channel.h | 3 + include/qemu/sockets.h | 17 --- include/sysemu/os-posix.h | 9 ++ include/sysemu/os-win32.h | 106 ++++++++++++---- io/channel-command.c | 6 +- io/channel-file.c | 6 +- io/channel-socket.c | 84 ++++++++----- io/channel-watch.c | 152 +++++++++++++++++++++- io/channel.c | 14 +++ linux-user/flatload.c | 1 - migration/qemu-file-unix.c | 14 +-- migration/tcp.c | 7 +- net/socket.c | 19 ++- qemu-char.c | 96 ++++++-------- slirp/slirp.h | 2 - slirp/tcp_input.c | 4 - tests/io-channel-helpers.c | 6 +- tests/test-io-channel-socket.c | 92 +++++++------- util/oslib-win32.c | 280 ++++++++++++++++++++++++++++++++++++++++- util/qemu-coroutine-io.c | 6 +- util/qemu-sockets.c | 10 +- 24 files changed, 719 insertions(+), 244 deletions(-) -- 2.5.0
