[libvirt] [PATCH] qemu driver: fix version check typos

Jim Meyering jim at meyering.net
Thu May 20 17:23:23 UTC 2010


Chris Wright wrote:

> Looks like some cut'n paste error to me.
>
> Signed-off-by: Chris Wright <chrisw at redhat.com>
> ---
>  src/qemu/qemu_conf.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
> index 3e334dc..6d2ac6e 100644
> --- a/src/qemu/qemu_conf.c
> +++ b/src/qemu/qemu_conf.c
> @@ -1291,13 +1291,13 @@ int qemudParseHelpStr(const char *qemu,
>      ++p;
>
>      minor = virParseNumber(&p);
> -    if (major == -1 || *p != '.')
> +    if (minor == -1 || *p != '.')
>          goto fail;
>
>      ++p;
>
>      micro = virParseNumber(&p);
> -    if (major == -1)
> +    if (micro == -1)
>          goto fail;
>
>      SKIP_BLANKS(p);

Thanks, Chris.
I've added to the log and will push this soon.

>From e8353d366b761817850f9648084f5bf915175fdb Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw at redhat.com>
Date: Wed, 19 May 2010 15:37:26 -0700
Subject: [PATCH] qemu driver: fix version check typos

* src/qemu/qemu_conf.c (qemudParseHelpStr): Fix errors that made
it impossible to diagnose invalid minor and micro version number
components.

Signed-off-by: Chris Wright <chrisw at redhat.com>
---
 src/qemu/qemu_conf.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index be146fe..2e117c6 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1296,13 +1296,13 @@ int qemudParseHelpStr(const char *qemu,
     ++p;

     minor = virParseNumber(&p);
-    if (major == -1 || *p != '.')
+    if (minor == -1 || *p != '.')
         goto fail;

     ++p;

     micro = virParseNumber(&p);
-    if (major == -1)
+    if (micro == -1)
         goto fail;

     SKIP_BLANKS(p);
--
1.7.1.262.g5ef3d




More information about the libvir-list mailing list