From patchwork Fri Apr 20 23:37:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 154183 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 09BB2B6FC3 for ; Sat, 21 Apr 2012 10:44:02 +1000 (EST) Received: from localhost ([::1]:60841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLNPJ-0007v5-Vu for incoming@patchwork.ozlabs.org; Fri, 20 Apr 2012 19:38:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLNP6-0007da-DN for qemu-devel@nongnu.org; Fri, 20 Apr 2012 19:38:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SLNP4-0001dn-6D for qemu-devel@nongnu.org; Fri, 20 Apr 2012 19:38:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLNP3-0001dU-VH for qemu-devel@nongnu.org; Fri, 20 Apr 2012 19:38:14 -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 q3KNcBOR030558 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Apr 2012 19:38:11 -0400 Received: from localhost ([10.3.113.12]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3KNc9fs015972; Fri, 20 Apr 2012 19:38:10 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 20 Apr 2012 20:37:37 -0300 Message-Id: <1334965064-19316-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1334965064-19316-1-git-send-email-lcapitulino@redhat.com> References: <1334965064-19316-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/16] qemu-option: qemu_opts_from_qdict(): 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 do_device_add() and do_netdev_add() call qerror_report_err() to maintain their QError semantics. Signed-off-by: Luiz Capitulino --- hw/qdev-monitor.c | 7 +++++-- net.c | 5 ++++- qemu-option.c | 31 ++++++++++++++++++++++++------- qemu-option.h | 3 ++- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 81d6548..9635b44 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -554,10 +554,13 @@ void do_info_qdm(Monitor *mon) int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) { + Error *local_err = NULL; QemuOpts *opts; - opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict); - if (!opts) { + opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); return -1; } if (!monitor_cur_is_qmp() && qdev_device_help(opts)) { diff --git a/net.c b/net.c index f5d9cc7..246209f 100644 --- a/net.c +++ b/net.c @@ -1237,11 +1237,14 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict) int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data) { + Error *local_err = NULL; QemuOpts *opts; int res; - opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict); + opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &local_err); if (!opts) { + qerror_report_err(local_err); + error_free(local_err); return -1; } diff --git a/qemu-option.c b/qemu-option.c index afee3fb..427e1db 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -971,13 +971,19 @@ void qemu_opts_set_defaults(QemuOptsList *list, const char *params, assert(opts); } +typedef struct OptsFromQDictState { + QemuOpts *opts; + Error *err; +} OptsFromQDictState; + static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque) { + OptsFromQDictState *state = opaque; char buf[32]; const char *value; int n; - if (!strcmp(key, "id")) { + if (!strcmp(key, "id") || error_is_set(&state->err)) { return; } @@ -1005,7 +1011,8 @@ static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque) default: return; } - qemu_opt_set(opaque, key, value); + + qemu_opt_set_err(state->opts, key, value, &state->err); } /* @@ -1014,21 +1021,31 @@ static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque) * Only QStrings, QInts, QFloats and QBools are copied. Entries with * other types are silently ignored. */ -QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict) +QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, + Error **errp) { - QemuOpts *opts; + OptsFromQDictState state; Error *local_err = NULL; + QemuOpts *opts; opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, &local_err); if (error_is_set(&local_err)) { - qerror_report_err(local_err); - error_free(local_err); + error_propagate(errp, local_err); return NULL; } assert(opts != NULL); - qdict_iter(qdict, qemu_opts_from_qdict_1, opts); + + state.err = local_err; + state.opts = opts; + qdict_iter(qdict, qemu_opts_from_qdict_1, &state); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + qemu_opts_del(opts); + return NULL; + } + return opts; } diff --git a/qemu-option.h b/qemu-option.h index c0e022b..951dec3 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -132,7 +132,8 @@ int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname 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); -QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict); +QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, + Error **errp); QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict); typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque);