Commit a749f42d authored by Miki Mishael's avatar Miki Mishael Committed by Michael Roth
Browse files

qemu-ga: isa-serial support on Windows 



Add support for isa-serial method for qemu-ga on Windows,
Added -p command line parameter for serial port name
specification, e.g. "-p COM15".

Signed-off-by: default avatarMiki Mishael <mmishael@redhat.com>
Signed-off-by: default avatarDmitry Fleytman <dfleytma@redhat.com>

*added default isa-serial path to help output

Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 10b7c5dd

qga/channel-win32.c

+18 −2
Original line number Diff line number Diff line
@@ -287,12 +287,22 @@ GIOStatus ga_channel_write_all(GAChannel *c, const char *buf, size_t size) 
static gboolean ga_channel_open(GAChannel *c, GAChannelMethod method,

                                const gchar *path)

{

    if (method != GA_CHANNEL_VIRTIO_SERIAL) {

    COMMTIMEOUTS comTimeOut = {0};

    gchar newpath[MAXPATHLEN] = {0};

    comTimeOut.ReadIntervalTimeout = 1;



    if (method != GA_CHANNEL_VIRTIO_SERIAL && method != GA_CHANNEL_ISA_SERIAL) {

        g_critical("unsupported communication method");

        return false;

    }



    c->handle = CreateFile(path, GENERIC_READ | GENERIC_WRITE, 0, NULL,

    if (method == GA_CHANNEL_ISA_SERIAL){

        snprintf(newpath, sizeof(newpath), "\\\\.\\%s", path);

    }else {

        g_strlcpy(newpath, path, sizeof(newpath));

    }



    c->handle = CreateFile(newpath, GENERIC_READ | GENERIC_WRITE, 0, NULL,

                           OPEN_EXISTING,

                           FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL);

    if (c->handle == INVALID_HANDLE_VALUE) {
@@ -300,6 +310,12 @@ static gboolean ga_channel_open(GAChannel *c, GAChannelMethod method, 
        return false;

    }



    if (method == GA_CHANNEL_ISA_SERIAL && !SetCommTimeouts(c->handle,&comTimeOut)) {

        g_critical("error setting timeout for com port: %lu",GetLastError());

        CloseHandle(c->handle);

        return false;

    }



    return true;

}

qga/main.c

+13 −4
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ 
#ifndef _WIN32

#define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0"

#define QGA_STATE_RELATIVE_DIR  "run"

#define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0"

#else

#define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0"

#define QGA_STATE_RELATIVE_DIR  "qemu-ga"

#define QGA_SERIAL_PATH_DEFAULT "COM1"

#endif

#ifdef CONFIG_FSFREEZE

#define QGA_FSFREEZE_HOOK_DEFAULT CONFIG_QEMU_CONFDIR "/fsfreeze-hook"
@@ -189,6 +191,8 @@ static void usage(const char *cmd) 
"  -m, --method      transport method: one of unix-listen, virtio-serial, or\n"

"                    isa-serial (virtio-serial is the default)\n"

"  -p, --path        device/socket path (the default for virtio-serial is:\n"

"                    %s,\n"

"                    the default for isa-serial is:\n"

"                    %s)\n"

"  -l, --logfile     set logfile path, logs to stderr by default\n"

"  -f, --pidfile     specify pidfile (default is %s)\n"
@@ -215,7 +219,8 @@ static void usage(const char *cmd) 
"  -h, --help        display this help and exit\n"

"\n"

"Report bugs to <mdroth@linux.vnet.ibm.com>\n"

    , cmd, QEMU_VERSION, QGA_VIRTIO_PATH_DEFAULT, dfl_pathnames.pidfile,

    , cmd, QEMU_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_SERIAL_PATH_DEFAULT,

    dfl_pathnames.pidfile,

#ifdef CONFIG_FSFREEZE

    QGA_FSFREEZE_HOOK_DEFAULT,

#endif
@@ -659,12 +664,16 @@ static gboolean channel_init(GAState *s, const gchar *method, const gchar *path) 
    }



    if (path == NULL) {

        if (strcmp(method, "virtio-serial") != 0) {

        if (strcmp(method, "virtio-serial") == 0 ) {

            /* try the default path for the virtio-serial port */

            path = QGA_VIRTIO_PATH_DEFAULT;

        } else if (strcmp(method, "isa-serial") == 0){

            /* try the default path for the serial port - COM1 */

            path = QGA_SERIAL_PATH_DEFAULT;

        } else {

            g_critical("must specify a path for this channel");

            return false;

        }

        /* try the default path for the virtio-serial port */

        path = QGA_VIRTIO_PATH_DEFAULT;

    }



    if (strcmp(method, "virtio-serial") == 0) {