From e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Mon, 30 Apr 2012 18:00:54 +0200 Subject: qemu-ga: Implement alternative to O_ASYNC ga_channel_open() was using open flag O_ASYNC for SIGIO-driven I/O. This breaks on illumos, so fall back to POSIX I_SETSIG ioctl (SIGPOLL). Signed-off-by: Lee Essen Signed-off-by: Andreas Färber Reviewed-by: Stefan Hajnoczi Signed-off-by: Blue Swirl --- qga/channel-posix.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'qga') diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 40f7658ccd..57eea06c47 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -3,6 +3,10 @@ #include "qemu_socket.h" #include "qga/channel.h" +#ifdef CONFIG_SOLARIS +#include +#endif + #define GA_CHANNEL_BAUDRATE_DEFAULT B38400 /* for isa-serial channels */ struct GAChannel { @@ -123,11 +127,23 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod switch (c->method) { case GA_CHANNEL_VIRTIO_SERIAL: { - int fd = qemu_open(path, O_RDWR | O_NONBLOCK | O_ASYNC); + int fd = qemu_open(path, O_RDWR | O_NONBLOCK +#ifndef CONFIG_SOLARIS + | O_ASYNC +#endif + ); if (fd == -1) { g_critical("error opening channel: %s", strerror(errno)); exit(EXIT_FAILURE); } +#ifdef CONFIG_SOLARIS + ret = ioctl(fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI); + if (ret == -1) { + g_critical("error setting event mask for channel: %s", + strerror(errno)); + exit(EXIT_FAILURE); + } +#endif ret = ga_channel_client_add(c, fd); if (ret) { g_critical("error adding channel to main loop"); -- cgit v1.2.3-55-g7522