Il 07/01/2013 14:55, Gerd Hoffmann ha scritto:
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> include/char/char.h | 3 ++-
> qemu-char.c | 24 +++++++++++++++---------
> vl.c | 9 ++++++---
> 3 files changed, 23 insertions(+), 13 deletions(-)
>
> diff --git a/include/char/char.h b/include/char/char.h
> index baa5d03..1952a10 100644
> --- a/include/char/char.h
> +++ b/include/char/char.h
> @@ -89,7 +89,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/qemu-char.c b/qemu-char.c
> index f41788c..91f64e9 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -2779,19 +2779,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++) {
> @@ -2799,15 +2800,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;
> }
>
> @@ -2837,6 +2838,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);
> @@ -2846,7 +2848,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/vl.c b/vl.c
> index f056c95..f5f2026 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2052,11 +2052,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)
> + 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;
> }
>
>
