Commit e61ab1da authored by Andreas Färber's avatar Andreas Färber Committed by Blue Swirl
Browse files

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: default avatarLee Essen <lee.essen@nowonline.co.uk>
Signed-off-by: default avatarAndreas Färber <andreas.faerber@web.de>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 3239ad04

qga/channel-posix.c

+17 −1
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
#include "qemu_socket.h"

#include "qga/channel.h"



#ifdef CONFIG_SOLARIS

#include <stropts.h>

#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");