From patchwork Tue Apr 17 19:36:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 153320 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 33CCBB7093 for ; Wed, 18 Apr 2012 06:53:40 +1000 (EST) Received: from localhost ([::1]:35968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKEDm-0007ys-Cl for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 15:37:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECY-00055K-OF 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 1SKECV-0008Ot-2w for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECU-0008OY-Qh for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:31 -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 q3HJaR2Y019786 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Apr 2012 15:36:27 -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 q3HJaQ9F032562; Tue, 17 Apr 2012 15:36:26 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 16:36:11 -0300 Message-Id: <1334691381-7666-9-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 08/18] qemu-option: opts_do_parse(): use 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 The functions qemu_opts_do_parse() and opts_parse() both call opts_do_parse(), but their callers expect QError semantics. Thus, both functions call qerro_report_err() to keep the expected semantics. Signed-off-by: Luiz Capitulino --- qemu-option.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index b409742..41e7a57 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -848,12 +848,11 @@ int qemu_opts_print(QemuOpts *opts, void *dummy) return 0; } -static int opts_do_parse(QemuOpts *opts, const char *params, - const char *firstname, bool prepend) +static void opts_do_parse(QemuOpts *opts, const char *params, + const char *firstname, bool prepend, Error **errp) { char option[128], value[1024]; const char *p,*pe,*pc; - Error *local_err = NULL; for (p = params; *p != '\0'; p++) { pe = strchr(p, '='); @@ -885,23 +884,29 @@ static int opts_do_parse(QemuOpts *opts, const char *params, } if (strcmp(option, "id") != 0) { /* store and parse */ - opt_set(opts, option, value, prepend, &local_err); - if (error_is_set(&local_err)) { - qerror_report_err(local_err); - error_free(local_err); - return -1; + opt_set(opts, option, value, prepend, errp); + if (error_is_set(errp)) { + return; } } if (*p != ',') { break; } } - return 0; } int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname) { - return opts_do_parse(opts, params, firstname, false); + 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; + } + + return 0; } static QemuOpts *opts_parse(QemuOptsList *list, const char *params, @@ -934,18 +939,23 @@ static QemuOpts *opts_parse(QemuOptsList *list, const char *params, } if (opts == NULL) { if (error_is_set(&local_err)) { - qerror_report_err(local_err); - error_free(local_err); + goto exit_err; } return NULL; } - if (opts_do_parse(opts, params, firstname, defaults) != 0) { + opts_do_parse(opts, params, firstname, defaults, &local_err); + if (error_is_set(&local_err)) { qemu_opts_del(opts); - return NULL; + goto exit_err; } return opts; + +exit_err: + qerror_report_err(local_err); + error_free(local_err); + return NULL; } QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params,