[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 01/19] Suppress more more kraxelisms
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH 01/19] Suppress more more kraxelisms |
Date: |
Thu, 10 Sep 2009 21:02:40 +0300 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
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 <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
> ---
> 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
>
>
- [Qemu-devel] [PATCH 00/19] Port -net to QemuOpts, Mark McLoughlin, 2009/09/10
- [Qemu-devel] [PATCH 11/19] Port -net tap to QemuOpts, Mark McLoughlin, 2009/09/10
- [Qemu-devel] [PATCH 01/19] Suppress more more kraxelisms, Mark McLoughlin, 2009/09/10
- Re: [Qemu-devel] [PATCH 01/19] Suppress more more kraxelisms,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 02/19] Remove bogus error message from qemu_opts_set(), Mark McLoughlin, 2009/09/10
- [Qemu-devel] [PATCH 07/19] Never overwrite a QemuOpt, Mark McLoughlin, 2009/09/10
- [Qemu-devel] [PATCH 04/19] Remove double error message for -device option parsing, Mark McLoughlin, 2009/09/10
- [Qemu-devel] [PATCH 03/19] Remove double error message in qemu_option_set(), Mark McLoughlin, 2009/09/10