aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-03-07 11:16:39 +0100
committerDaniel P. Berrange <berrange@redhat.com>2016-03-10 17:10:19 +0000
commitb83b68a0132f43f3ebcb61c9237ec1090da58894 (patch)
treefd998ea8eab8fe6e5828f67c0ad4874d4838e47e /io
parente560d141ab0504495142486c21769df1ec346479 (diff)
downloadqemu-arm-b83b68a0132f43f3ebcb61c9237ec1090da58894.tar.gz
io: introduce qio_channel_create_socket_watch
Sockets are not in the same namespace as file descriptors on Windows. As an initial step, introduce separate APIs for file descriptor and socket watches. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'io')
-rw-r--r--io/channel-socket.c6
-rw-r--r--io/channel-watch.c15
2 files changed, 18 insertions, 3 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 5f087e68d1..775bb9fcbc 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -714,9 +714,9 @@ static GSource *qio_channel_socket_create_watch(QIOChannel *ioc,
GIOCondition condition)
{
QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(ioc);
- return qio_channel_create_fd_watch(ioc,
- sioc->fd,
- condition);
+ return qio_channel_create_socket_watch(ioc,
+ sioc->fd,
+ condition);
}
static void qio_channel_socket_class_init(ObjectClass *klass,
diff --git a/io/channel-watch.c b/io/channel-watch.c
index 537360527a..dfac8f8a58 100644
--- a/io/channel-watch.c
+++ b/io/channel-watch.c
@@ -172,6 +172,21 @@ GSource *qio_channel_create_fd_watch(QIOChannel *ioc,
return source;
}
+#ifdef CONFIG_WIN32
+GSource *qio_channel_create_socket_watch(QIOChannel *ioc,
+ int socket,
+ GIOCondition condition)
+{
+ abort();
+}
+#else
+GSource *qio_channel_create_socket_watch(QIOChannel *ioc,
+ int socket,
+ GIOCondition condition)
+{
+ return qio_channel_create_fd_watch(ioc, socket, condition);
+}
+#endif
GSource *qio_channel_create_fd_pair_watch(QIOChannel *ioc,
int fdread,