From: Peter Maydell Date: Mon, 14 Mar 2016 11:49:32 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-io-win32-2016-03-11-1' into... X-Git-Tag: v2.6.0-rc0~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8326ec2c834f7debbba0ed80a433c3ae0cf48289;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/berrange/tags/pull-io-win32-2016-03-11-1' into staging Merge I/O fixes for win32 # gpg: Signature made Fri 11 Mar 2016 10:03:20 GMT using RSA key ID 15104FDF # gpg: Good signature from "Daniel P. Berrange " # gpg: aka "Daniel P. Berrange " * remotes/berrange/tags/pull-io-win32-2016-03-11-1: osdep: remove use of socket_error() from all code osdep: add wrappers for socket functions char: remove qemu_chr_open_socket_fd method char: remove socket_try_connect method char: remove qemu_chr_finish_socket_connection method io: implement socket watch for win32 using WSAEventSelect+select io: remove checking of EWOULDBLOCK io: use qemu_accept to ensure SOCK_CLOEXEC is set io: introduce qio_channel_create_socket_watch io: pass HANDLE to g_source_add_poll on Win32 io: fix copy+paste mistake in socket error message io: assert errors before asserting content in I/O test io: set correct error object in background reader test thread io: wait for incoming client in socket test io: bind to socket before creating QIOChannelSocket io: initialize sockets in test program io: use bind() to check for IPv4/6 availability osdep: fix socket_error() to work with Mingw64 Signed-off-by: Peter Maydell --- 8326ec2c834f7debbba0ed80a433c3ae0cf48289