From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rulqg-0003PL-Po for qemu-devel@nongnu.org; Tue, 07 Feb 2012 09:16:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rulqc-0007D8-OQ for qemu-devel@nongnu.org; Tue, 07 Feb 2012 09:16:46 -0500 Received: from oxygen.pond.sub.org ([78.46.104.156]:36059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rulqc-0007D3-Ht for qemu-devel@nongnu.org; Tue, 07 Feb 2012 09:16:42 -0500 From: Markus Armbruster Date: Tue, 7 Feb 2012 15:09:25 +0100 Message-Id: <1328623766-12287-19-git-send-email-armbru@redhat.com> In-Reply-To: <1328623766-12287-1-git-send-email-armbru@redhat.com> References: <1328623766-12287-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 18/19] qemu-char: Chardev open error reporting, generic part List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com 1. Convert to error_report(). 2. All backends now report their errors, no need to follow up with an unspecific "opening backend failed". Drop the message. Signed-off-by: Markus Armbruster --- qemu-char.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index ecbb595..fe0cfce 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2808,33 +2808,30 @@ static const struct { CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, void (*init)(struct CharDriverState *s)) { + const char *backend = qemu_opt_get(opts, "backend"); CharDriverState *chr; int i; if (qemu_opts_id(opts) == NULL) { - fprintf(stderr, "chardev: no id specified\n"); + error_report("character device requires parameter id"); return NULL; } - if (qemu_opt_get(opts, "backend") == NULL) { - fprintf(stderr, "chardev: \"%s\" missing backend\n", - qemu_opts_id(opts)); + if (!backend) { + error_report("character device requires parameter backend"); return NULL; } for (i = 0; i < ARRAY_SIZE(backend_table); i++) { - if (strcmp(backend_table[i].name, qemu_opt_get(opts, "backend")) == 0) + if (strcmp(backend_table[i].name, backend) == 0) break; } if (i == ARRAY_SIZE(backend_table)) { - fprintf(stderr, "chardev: backend \"%s\" not found\n", - qemu_opt_get(opts, "backend")); + error_report("character device backend '%s' not found", backend); return NULL; } chr = backend_table[i].open(opts); if (!chr) { - fprintf(stderr, "chardev: opening backend \"%s\" failed\n", - qemu_opt_get(opts, "backend")); return NULL; } -- 1.7.6.5