From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDJ7f-0007cV-NL for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:26:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDJ7c-0003Us-KJ for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:26:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDJ7c-0003UT-Cb for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:26:52 -0400 From: Luiz Capitulino Date: Thu, 29 Mar 2012 14:26:37 -0300 Message-Id: <1333042003-15490-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1333042003-15490-1-git-send-email-lcapitulino@redhat.com> References: <1333042003-15490-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 07/13] qemu-option: opts_do_parse(): use error_set() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, aliguori@us.ibm.com, kraxel@redhat.com, stefanha@linux.vnet.ibm.com, armbru@redhat.com 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 38461d4..666eacd 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, -- 1.7.9.2.384.g4a92a