From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOWNX-0003jr-Tf for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:21:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOWNS-0001OX-Tj for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:21:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOWNS-0001NV-LX for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:21:50 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9HGLnCh015270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 17 Oct 2012 12:21:50 -0400 Date: Wed, 17 Oct 2012 13:22:45 -0300 From: Luiz Capitulino Message-ID: <20121017132245.16da4d4b@doriath.home> In-Reply-To: <1350468595-5238-2-git-send-email-kraxel@redhat.com> References: <1350468595-5238-1-git-send-email-kraxel@redhat.com> <1350468595-5238-2-git-send-email-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/3] chardev: add error reporting for qemu_chr_new_from_opts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org On Wed, 17 Oct 2012 12:09:53 +0200 Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann Reviewed-by: Luiz Capitulino > --- > qemu-char.c | 24 +++++++++++++++--------- > qemu-char.h | 3 ++- > vl.c | 8 ++++++-- > 3 files changed, 23 insertions(+), 12 deletions(-) > > diff --git a/qemu-char.c b/qemu-char.c > index b082bae..e2e1da8 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -2755,19 +2755,20 @@ static const struct { > }; > > CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, > - void (*init)(struct CharDriverState *s)) > + void (*init)(struct CharDriverState *s), > + Error **errp) > { > CharDriverState *chr; > int i; > > if (qemu_opts_id(opts) == NULL) { > - fprintf(stderr, "chardev: no id specified\n"); > + error_setg(errp, "chardev: no id specified\n"); > return NULL; > } > > if (qemu_opt_get(opts, "backend") == NULL) { > - fprintf(stderr, "chardev: \"%s\" missing backend\n", > - qemu_opts_id(opts)); > + error_setg(errp, "chardev: \"%s\" missing backend\n", > + qemu_opts_id(opts)); > return NULL; > } > for (i = 0; i < ARRAY_SIZE(backend_table); i++) { > @@ -2775,15 +2776,15 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, > break; > } > if (i == ARRAY_SIZE(backend_table)) { > - fprintf(stderr, "chardev: backend \"%s\" not found\n", > - qemu_opt_get(opts, "backend")); > + error_setg(errp, "chardev: backend \"%s\" not found\n", > + qemu_opt_get(opts, "backend")); > return NULL; > } > > chr = backend_table[i].open(opts); > if (!chr) { > - fprintf(stderr, "chardev: opening backend \"%s\" failed\n", > - qemu_opt_get(opts, "backend")); > + error_setg(errp, "chardev: opening backend \"%s\" failed\n", > + qemu_opt_get(opts, "backend")); > return NULL; > } > > @@ -2813,6 +2814,7 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*in > const char *p; > CharDriverState *chr; > QemuOpts *opts; > + Error *err = NULL; > > if (strstart(filename, "chardev:", &p)) { > return qemu_chr_find(p); > @@ -2822,7 +2824,11 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*in > if (!opts) > return NULL; > > - chr = qemu_chr_new_from_opts(opts, init); > + chr = qemu_chr_new_from_opts(opts, init, &err); > + if (error_is_set(&err)) { > + fprintf(stderr, "%s\n", error_get_pretty(err)); > + error_free(err); > + } > if (chr && qemu_opt_get_bool(opts, "mux", 0)) { > monitor_init(chr, MONITOR_USE_READLINE); > } > diff --git a/qemu-char.h b/qemu-char.h > index 486644b..adae13e 100644 > --- a/qemu-char.h > +++ b/qemu-char.h > @@ -88,7 +88,8 @@ struct CharDriverState { > * Returns: a new character backend > */ > CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, > - void (*init)(struct CharDriverState *s)); > + void (*init)(struct CharDriverState *s), > + Error **errp); > > /** > * @qemu_chr_new: > diff --git a/vl.c b/vl.c > index 5b357a3..d2f1c10 100644 > --- a/vl.c > +++ b/vl.c > @@ -1940,10 +1940,14 @@ static int device_init_func(QemuOpts *opts, void *opaque) > static int chardev_init_func(QemuOpts *opts, void *opaque) > { > CharDriverState *chr; > + Error *local_err = NULL; > > - chr = qemu_chr_new_from_opts(opts, NULL); > - if (!chr) > + chr = qemu_chr_new_from_opts(opts, NULL, &local_err); > + if (error_is_set(&local_err)) { > + fprintf(stderr, "%s\n", error_get_pretty(local_err)); > + error_free(local_err); > return -1; > + } > return 0; > } >