Commit 8326ec2c authored by Peter Maydell's avatar Peter Maydell
Browse files

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 <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* 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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d1ab9681 b16a44e1

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-o 
qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a

qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a



qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o

qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o libqemuutil.a libqemustub.a



fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o libqemuutil.a libqemustub.a

fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
@@ -329,7 +329,7 @@ ifneq ($(EXESUF),) 
qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)

endif



ivshmem-client$(EXESUF): $(ivshmem-client-obj-y)

ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) libqemuutil.a libqemustub.a

	$(call LINK, $^)

ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a

	$(call LINK, $^)

block/sheepdog.c

+2 −3
Original line number Diff line number Diff line
@@ -615,14 +615,13 @@ static coroutine_fn int send_co_req(int sockfd, SheepdogReq *hdr, void *data, 
    ret = qemu_co_send(sockfd, hdr, sizeof(*hdr));

    if (ret != sizeof(*hdr)) {

        error_report("failed to send a req, %s", strerror(errno));

        ret = -socket_error();

        return ret;

        return -errno;

    }



    ret = qemu_co_send(sockfd, data, *wlen);

    if (ret != *wlen) {

        ret = -socket_error();

        error_report("failed to send a req, %s", strerror(errno));

        return -errno;

    }



    return ret;

include/io/channel-watch.h

+19 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
 * monitor the file descriptor @fd for the

 * I/O conditions in @condition. This is able

 * monitor block devices, character devices,

 * sockets, pipes but not plain files.

 * pipes but not plain files or, on Win32, sockets.

 *

 * Returns: the new main loop source

 */
@@ -47,6 +47,24 @@ GSource *qio_channel_create_fd_watch(QIOChannel *ioc, 
                                     int fd,

                                     GIOCondition condition);



/**

 * qio_channel_create_socket_watch:

 * @ioc: the channel object

 * @fd: the file descriptor

 * @condition: the I/O condition

 *

 * Create a new main loop source that is able to

 * monitor the file descriptor @fd for the

 * I/O conditions in @condition. This is equivalent

 * to qio_channel_create_fd_watch on POSIX systems

 * but not on Windows.

 *

 * Returns: the new main loop source

 */

GSource *qio_channel_create_socket_watch(QIOChannel *ioc,

                                         int fd,

                                         GIOCondition condition);



/**

 * qio_channel_create_fd_pair_watch:

 * @ioc: the channel object

include/io/channel.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc, 
struct QIOChannel {

    Object parent;

    unsigned int features; /* bitmask of QIOChannelFeatures */

#ifdef _WIN32

    HANDLE event; /* For use with GSource on Win32 */

#endif

};



/**

include/qemu/sockets.h

+0 −17
Original line number Diff line number Diff line
@@ -3,26 +3,9 @@ 
#define QEMU_SOCKET_H



#ifdef _WIN32

#include <windows.h>

#include <winsock2.h>

#include <ws2tcpip.h>



#define socket_error() WSAGetLastError()



int inet_aton(const char *cp, struct in_addr *ia);



#else



#include <sys/socket.h>

#include <netinet/in.h>

#include <netinet/tcp.h>

#include <arpa/inet.h>

#include <netdb.h>

#include <sys/un.h>



#define socket_error() errno

#define closesocket(s) close(s)



#endif /* !_WIN32 */



#include "qapi-types.h"