From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mlo0M-0006c8-JI for qemu-devel@nongnu.org; Thu, 10 Sep 2009 14:04:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mlo0I-0006Xa-R2 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 14:04:22 -0400 Received: from [199.232.76.173] (port=58442 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mlo0I-0006XV-L9 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 14:04:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35778) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mlo0H-0006NX-VD for qemu-devel@nongnu.org; Thu, 10 Sep 2009 14:04:18 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8AI4Hlk021366 for ; Thu, 10 Sep 2009 14:04:17 -0400 Date: Thu, 10 Sep 2009 21:02:40 +0300 From: "Michael S. Tsirkin" Subject: Re: [Qemu-devel] [PATCH 01/19] Suppress more more kraxelisms Message-ID: <20090910180239.GC521@redhat.com> References: <1252595941-15196-1-git-send-email-markmc@redhat.com> <1252595941-15196-2-git-send-email-markmc@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1252595941-15196-2-git-send-email-markmc@redhat.com> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark McLoughlin Cc: qemu-devel@nongnu.org On Thu, Sep 10, 2009 at 04:18:43PM +0100, Mark McLoughlin wrote: > Let's kick off this series with some of the more critical fixes. > > Signed-off-by: Mark McLoughlin Acked-by: Michael S. Tsirkin > --- > hw/qdev.c | 2 +- > qemu-config.c | 2 +- > qemu-option.c | 6 +++--- > vl.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/qdev.c b/hw/qdev.c > index 6451b8a..c0ef55b 100644 > --- a/hw/qdev.c > +++ b/hw/qdev.c > @@ -137,7 +137,7 @@ static int set_property(const char *name, const char *value, void *opaque) > if (strcmp(name, "bus") == 0) > return 0; > > - if (-1 == qdev_prop_parse(dev, name, value)) { > + if (qdev_prop_parse(dev, name, value) == -1) { > qemu_error("can't set property \"%s\" to \"%s\" for \"%s\"\n", > name, value, dev->info->name); > return -1; > diff --git a/qemu-config.c b/qemu-config.c > index f6f4cb4..61e6ed1 100644 > --- a/qemu-config.c > +++ b/qemu-config.c > @@ -186,7 +186,7 @@ int qemu_set_option(const char *str) > return -1; > } > > - if (-1 == qemu_opt_set(opts, arg, str+offset+1)) { > + if (qemu_opt_set(opts, arg, str+offset+1) == -1) { > fprintf(stderr, "failed to set \"%s\" for %s \"%s\"\n", > arg, lists[i]->name, id); > return -1; > diff --git a/qemu-option.c b/qemu-option.c > index 0c2101e..f1a666f 100644 > --- a/qemu-option.c > +++ b/qemu-option.c > @@ -267,7 +267,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, > // Process parameter > switch (list->type) { > case OPT_FLAG: > - if (-1 == parse_option_bool(name, value, &flag)) > + if (parse_option_bool(name, value, &flag) == -1) > return -1; > list->value.n = flag; > break; > @@ -282,7 +282,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, > break; > > case OPT_SIZE: > - if (-1 == parse_option_size(name, value, &list->value.n)) > + if (parse_option_size(name, value, &list->value.n) == -1) > return -1; > break; > > @@ -745,7 +745,7 @@ int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname > } > if (strcmp(option, "id") != 0) { > /* store and parse */ > - if (-1 == qemu_opt_set(opts, option, value)) { > + if (qemu_opt_set(opts, option, value) == -1) { > return -1; > } > } > diff --git a/vl.c b/vl.c > index 1dc3ffa..6da83a6 100644 > --- a/vl.c > +++ b/vl.c > @@ -5153,7 +5153,7 @@ int main(int argc, char **argv, char **envp) > fprintf(stderr, "parse error: %s\n", optarg); > exit(1); > } > - if (NULL == qemu_chr_open_opts(opts, NULL)) { > + if (!qemu_chr_open_opts(opts, NULL)) { > exit(1); > } > break; > -- > 1.6.2.5 > >