[Qemu-devel] [PATCH] w32: Fix compilation of new code

[Stefan Weil]

Some recently added new code did not compile for w32 targets.

The functions qemu_iohandler_fill and qemu_iohandler_poll need
data type fd_set which is declared in winsock2.h for w32 targets.

Moving the functions from qemu-common.h to qemu_socket.h fixes
compilations for w32 without adding a new include file to qemu-common.h.

Cc: Paolo Bonzini <address@hidden>
Cc: Anthony Liguori <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
---
 iohandler.c   |    1 +
 qemu-common.h |    3 ---
 qemu_socket.h |    4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/iohandler.c b/iohandler.c
index 2b82421..bf1ba5c 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -26,6 +26,7 @@
 #include "qemu-common.h"
 #include "qemu-char.h"
 #include "qemu-queue.h"
+#include "qemu_socket.h"
 
 #ifndef _WIN32
 #include <sys/wait.h>
diff --git a/qemu-common.h b/qemu-common.h
index 8ecb488..eb2c96a 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -228,9 +228,6 @@ typedef void IOReadHandler(void *opaque, const uint8_t 
*buf, int size);
 typedef int IOCanReadHandler(void *opaque);
 typedef void IOHandler(void *opaque);
 
-void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds, fd_set 
*xfds);
-void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds, int 
rc);
-
 struct ParallelIOArg {
     void *buffer;
     int count;
diff --git a/qemu_socket.h b/qemu_socket.h
index 180e4db..4a6ef82 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -32,6 +32,10 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #include "qemu-option.h"
 
+/* Functions from iohandler.c. */
+void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds, fd_set 
*xfds);
+void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds, int 
rc);
+
 /* misc helpers */
 int qemu_socket(int domain, int type, int protocol);
 int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
-- 
1.7.2.5