[Qemu-devel] [PATCH V2] qemu-ga: isa-serial support on Windows

[Qemu-devel] [PATCH V2] qemu-ga: isa-serial support on Windows

[Miki Mishael]

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".

Changes since V1:
* define default path for isa-serial for linux, "/dev/ttyS0".
* replaced static void ga_serial_path_correction function for path correction with snprintf.
* minor indentation fix.
* fixed error output when setting timeout for com port fails.

Miki Mishael (1):
  qemu-ga: isa-serial support on Windows

 qga/channel-win32.c | 20 ++++++++++++++++++--
 qga/main.c          | 12 +++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH V2] qemu-ga: isa-serial support on Windows

[Miki Mishael]

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: Miki Mishael <mmishael@redhat.com>
Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
---
 qga/channel-win32.c | 20 ++++++++++++++++++--
 qga/main.c          | 12 +++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 8a303f3..0d5e5f5 100644
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -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;
 }
 
diff --git a/qga/main.c b/qga/main.c
index c58b26a..c0b09ad 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -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"
@@ -659,12 +661,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) {
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH V2] qemu-ga: isa-serial support on Windows

[Miki Mishael]

Hello,

I wonder if you have few minutes to review the patch and contribute to apply it to upstream.
I appreciate your help.

Link:
http://lists.nongnu.org/archive/html/qemu-devel/2014-01/msg01823.html

Thanks,

Miki

----- Original Message -----
From: "Miki Mishael" <mmishael@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Yan Vugenfirer" <yvugenfi@redhat.com>, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Adam Litke" <aglitke@linux.vnet.ibm.com>, "Ronen Hod" <rhod@redhat.com>, "Anthony Liguori" <aliguori@amazon.com>, "Dmitry Fleytman" <dfleytma@redhat.com>
Sent: Wednesday, January 15, 2014 11:33:43 AM
Subject: [Qemu-devel] [PATCH V2] 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".

Changes since V1:
* define default path for isa-serial for linux, "/dev/ttyS0".
* replaced static void ga_serial_path_correction function for path correction with snprintf.
* minor indentation fix.
* fixed error output when setting timeout for com port fails.

Miki Mishael (1):
  qemu-ga: isa-serial support on Windows

 qga/channel-win32.c | 20 ++++++++++++++++++--
 qga/main.c          | 12 +++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

-- 
1.8.3.1

Re: [Qemu-devel] [PATCH V2] qemu-ga: isa-serial support on Windows

[Michael Roth]

Quoting Miki Mishael (2014-01-15 03:33:44)
> 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: Miki Mishael <mmishael@redhat.com>
> Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>

Thanks, applied to qga tree:                                                                                 

  https://github.com/mdroth/qemu/commits/qga

> ---
>  qga/channel-win32.c | 20 ++++++++++++++++++--
>  qga/main.c          | 12 +++++++++---
>  2 files changed, 27 insertions(+), 5 deletions(-)
> 
> diff --git a/qga/channel-win32.c b/qga/channel-win32.c
> index 8a303f3..0d5e5f5 100644
> --- a/qga/channel-win32.c
> +++ b/qga/channel-win32.c
> @@ -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;
>  }
> 
> diff --git a/qga/main.c b/qga/main.c
> index c58b26a..c0b09ad 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -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"
> @@ -659,12 +661,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) {
> -- 
> 1.8.3.1