Patchwork [02/19] Remove bogus error message from qemu_opts_set()

login
register
mail settings
Submitter Mark McLoughlin
Date Sept. 10, 2009, 3:18 p.m.
Message ID <1252595941-15196-3-git-send-email-markmc@redhat.com>
Download mbox | patch
Permalink /patch/33322/
State Superseded
Headers show

Comments

Mark McLoughlin - Sept. 10, 2009, 3:18 p.m.
The only way qemu_opts_create() can fail is if a QemuOpts with that id
already exists and fail_if_exists=1. In that case, we already print
an error which makes more sense than the one in qemu_opts_set().

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 qemu-option.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Michael S. Tsirkin - Sept. 10, 2009, 6:01 p.m.
On Thu, Sep 10, 2009 at 04:18:44PM +0100, Mark McLoughlin wrote:
> The only way qemu_opts_create() can fail is if a QemuOpts with that id
> already exists and fail_if_exists=1. In that case, we already print
> an error which makes more sense than the one in qemu_opts_set().
> 
> Signed-off-by: Mark McLoughlin <markmc@redhat.com>
> ---
>  qemu-option.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/qemu-option.c b/qemu-option.c
> index f1a666f..4d544c7 100644
> --- a/qemu-option.c
> +++ b/qemu-option.c
> @@ -669,11 +669,8 @@ int qemu_opts_set(QemuOptsList *list, const char *id,
>      QemuOpts *opts;
>  
>      opts = qemu_opts_create(list, id, 1);
> -    if (opts == NULL) {
> -        fprintf(stderr, "id \"%s\" not found for \"%s\"\n",
> -                id, list->name);
> +    if (opts == NULL)
>          return -1;
> -    }

I thought we are supposed to keep {} around?
Yes I hate this too.


>      return qemu_opt_set(opts, name, value);
>  }
>  
> -- 
> 1.6.2.5
> 
>

Patch

diff --git a/qemu-option.c b/qemu-option.c
index f1a666f..4d544c7 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -669,11 +669,8 @@  int qemu_opts_set(QemuOptsList *list, const char *id,
     QemuOpts *opts;
 
     opts = qemu_opts_create(list, id, 1);
-    if (opts == NULL) {
-        fprintf(stderr, "id \"%s\" not found for \"%s\"\n",
-                id, list->name);
+    if (opts == NULL)
         return -1;
-    }
     return qemu_opt_set(opts, name, value);
 }