Patchwork [04/19] Remove double error message for -device option parsing

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

Comments

Mark McLoughlin - Sept. 10, 2009, 3:18 p.m.
qemu_opts_parse() gives a suitable error message in all failure cases
so we can remove the error message from the caller.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 vl.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Mark McLoughlin - Sept. 10, 2009, 6:10 p.m.
On Thu, 2009-09-10 at 18:25 +0200, Juan Quintela wrote:
> Mark McLoughlin <markmc@redhat.com> wrote:
> > qemu_opts_parse() gives a suitable error message in all failure cases
> > so we can remove the error message from the caller.
> >
> > Signed-off-by: Mark McLoughlin <markmc@redhat.com>
> > ---
> >  vl.c |    5 +----
> >  1 files changed, 1 insertions(+), 4 deletions(-)
> >
> > diff --git a/vl.c b/vl.c
> > index 6da83a6..ed07d50 100644
> > --- a/vl.c
> > +++ b/vl.c
> > @@ -5251,11 +5251,8 @@ int main(int argc, char **argv, char **envp)
> >                  add_device_config(DEV_USB, optarg);
> >                  break;
> >              case QEMU_OPTION_device:
> > -                opts = qemu_opts_parse(&qemu_device_opts, optarg, "driver");
> > -                if (!opts) {
> > -                    fprintf(stderr, "parse error: %s\n", optarg);
> > +                if (!qemu_opts_parse(&qemu_device_opts, optarg, "driver"))
> >                      exit(1);
> > -                }
> >                  break;
> >              case QEMU_OPTION_smp:
> >                  smp_parse(optarg);
> 
> This was the only use of opts variable, you have to remove it.

I did, but then re-added it when I re-based to Anthony's queue. The
chardev stuff uses it.

> And you shouldn't remove the braces (read the qemu coding style).

Yeah, I try not to, it was a reflex, I guess.

(It's also not helped that a lot of the existing code doesn't follow
this aspect of the coding style)

Cheers,
Mark.

Patch

diff --git a/vl.c b/vl.c
index 6da83a6..ed07d50 100644
--- a/vl.c
+++ b/vl.c
@@ -5251,11 +5251,8 @@  int main(int argc, char **argv, char **envp)
                 add_device_config(DEV_USB, optarg);
                 break;
             case QEMU_OPTION_device:
-                opts = qemu_opts_parse(&qemu_device_opts, optarg, "driver");
-                if (!opts) {
-                    fprintf(stderr, "parse error: %s\n", optarg);
+                if (!qemu_opts_parse(&qemu_device_opts, optarg, "driver"))
                     exit(1);
-                }
                 break;
             case QEMU_OPTION_smp:
                 smp_parse(optarg);