From patchwork Tue Apr 17 19:36:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 153297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 93251B7062 for ; Wed, 18 Apr 2012 05:37:05 +1000 (EST) Received: from localhost ([::1]:59858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKED1-0005gX-F9 for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 15:37:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECb-0005E0-EE for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKECW-0008PD-In for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECW-0008Ow-5U for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:32 -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 q3HJaTot009452 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Apr 2012 15:36:29 -0400 Received: from localhost (ovpn-113-173.phx2.redhat.com [10.3.113.173]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3HJaSGP032571; Tue, 17 Apr 2012 15:36:28 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 16:36:12 -0300 Message-Id: <1334691381-7666-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> References: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 09/18] qemu-option: qemu_opts_do_parse(): convert error_set() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_chr_parse_compat() calls qerror_report_err() because its callers expect QError semantics. Signed-off-by: Luiz Capitulino --- qemu-char.c | 12 ++++++++++-- qemu-option.c | 10 ++++------ qemu-option.h | 3 ++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 3a5d2b6..acb0c30 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2651,8 +2651,12 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) qemu_opt_set(opts, "host", host); qemu_opt_set(opts, "port", port); if (p[pos] == ',') { - if (qemu_opts_do_parse(opts, p+pos+1, NULL) != 0) + qemu_opts_do_parse(opts, p+pos+1, NULL, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); goto fail; + } } if (strstart(filename, "telnet:", &p)) qemu_opt_set(opts, "telnet", "on"); @@ -2683,8 +2687,12 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) } if (strstart(filename, "unix:", &p)) { qemu_opt_set(opts, "backend", "socket"); - if (qemu_opts_do_parse(opts, p, "path") != 0) + qemu_opts_do_parse(opts, p, "path", &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); goto fail; + } return opts; } if (strstart(filename, "/dev/parport", NULL) || diff --git a/qemu-option.c b/qemu-option.c index 41e7a57..8a9d8d5 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -895,18 +895,16 @@ static void opts_do_parse(QemuOpts *opts, const char *params, } } -int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname) +void qemu_opts_do_parse(QemuOpts *opts, const char *params, + const char *firstname, Error **errp) { Error *local_err = NULL; opts_do_parse(opts, params, firstname, false, &local_err); if (error_is_set(&local_err)) { - qerror_report_err(local_err); - error_free(local_err); - return -1; + error_propagate(errp, local_err); + return; } - - return 0; } static QemuOpts *opts_parse(QemuOptsList *list, const char *params, diff --git a/qemu-option.h b/qemu-option.h index e9fbbb5..4480c17 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -126,7 +126,8 @@ int qemu_opts_set(QemuOptsList *list, const char *id, const char *qemu_opts_id(QemuOpts *opts); void qemu_opts_del(QemuOpts *opts); void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp); -int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname); +void qemu_opts_do_parse(QemuOpts *opts, const char *params, + const char *firstname, Error **errp); QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int permit_abbrev); void qemu_opts_set_defaults(QemuOptsList *list, const char *params, int permit_abbrev);