Patchwork qemu-ga: fix confusing GAChannelMethod comparison

login
register
mail settings
Submitter Stefan Hajnoczi
Date Feb. 19, 2013, 2:12 p.m.
Message ID <1361283154-11534-1-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/221705/
State New
Headers show

Comments

Stefan Hajnoczi - Feb. 19, 2013, 2:12 p.m.
In commit 7868e26e5930f49ca942311885776b938dcf3b77
("qemu-ga: add initial win32 support") support was added for qemu-ga on
Windows using virtio-serial.  Other channel methods (ISA serial and UNIX
domain socket) are not supported on Windows.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qga/channel-win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Michael Roth - Feb. 20, 2013, 4:38 p.m.
On Tue, Feb 19, 2013 at 03:12:34PM +0100, Stefan Hajnoczi wrote:
> In commit 7868e26e5930f49ca942311885776b938dcf3b77
> ("qemu-ga: add initial win32 support") support was added for qemu-ga on
> Windows using virtio-serial.  Other channel methods (ISA serial and UNIX
> domain socket) are not supported on Windows.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Interesting... I think the original code was actually a bug that just
miraculously worked out thanks to GA_CHANNEL_VIRTIO_SERIAL being 0.

Thanks, applied to qga branch.

> ---
>  qga/channel-win32.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qga/channel-win32.c b/qga/channel-win32.c
> index 16bf44a..7ed98d7 100644
> --- a/qga/channel-win32.c
> +++ b/qga/channel-win32.c
> @@ -287,7 +287,7 @@ 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) {
> +    if (method != GA_CHANNEL_VIRTIO_SERIAL) {
>          g_critical("unsupported communication method");
>          return false;
>      }
> -- 
> 1.8.1.2
> 
>

Patch

diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 16bf44a..7ed98d7 100644
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -287,7 +287,7 @@  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) {
+    if (method != GA_CHANNEL_VIRTIO_SERIAL) {
         g_critical("unsupported communication method");
         return false;
     }