From patchwork Tue Jan 10 12:53:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 713242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tyX6P2cvzz9sR9 for ; Tue, 10 Jan 2017 23:54:37 +1100 (AEDT) Received: from localhost ([::1]:46860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQvwh-0008TB-0d for incoming@patchwork.ozlabs.org; Tue, 10 Jan 2017 07:54:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQvvY-0007d2-0G for qemu-devel@nongnu.org; Tue, 10 Jan 2017 07:53:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cQvvW-0003uL-Qa for qemu-devel@nongnu.org; Tue, 10 Jan 2017 07:53:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46242) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cQvvW-0003uE-Hb for qemu-devel@nongnu.org; Tue, 10 Jan 2017 07:53:22 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93D8BC056800; Tue, 10 Jan 2017 12:53:22 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0ACrGY4013892; Tue, 10 Jan 2017 07:53:21 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 10 Jan 2017 13:53:14 +0100 Message-Id: <1484052795-158195-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1484052795-158195-1-git-send-email-imammedo@redhat.com> References: <1484052795-158195-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 10 Jan 2017 12:53:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] reuse user_creatable_add_opts() instead of user_creatable_add() in monitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, dgilbert@redhat.com, armbru@redhat.com, pbonzini@redhat.com, afaerber@suse.de Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Simplify code by dropping ~57LOC by merging user_creatable_add() into user_creatable_add_opts() and using the later from monitor. Along with it allocate opts_visitor_new() once in user_creatable_add_opts(). As result we have one less API func and a more readable/simple user_creatable_add_opts() vs user_creatable_add(). Signed-off-by: Igor Mammedov Reviewed-by: Eric Blake --- include/qom/object_interfaces.h | 17 ---------- hmp.c | 5 +-- qom/object_interfaces.c | 71 ++++++++++------------------------------- 3 files changed, 18 insertions(+), 75 deletions(-) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index 8b17f4d..fdd7603 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -76,23 +76,6 @@ void user_creatable_complete(Object *obj, Error **errp); bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp); /** - * user_creatable_add: - * @qdict: the object definition - * @v: the visitor - * @errp: if an error occurs, a pointer to an area to store the error - * - * Create an instance of the user creatable object whose type - * is defined in @qdict by the 'qom-type' field, placing it - * in the object composition tree with name provided by the - * 'id' field. The remaining fields in @qdict are used to - * initialize the object properties. - * - * Returns: the newly created object or NULL on error - */ -Object *user_creatable_add(const QDict *qdict, - Visitor *v, Error **errp); - -/** * user_creatable_add_type: * @type: the object type name * @id: the unique ID for the object diff --git a/hmp.c b/hmp.c index b869617..e7bead5 100644 --- a/hmp.c +++ b/hmp.c @@ -1808,7 +1808,6 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) { Error *err = NULL; QemuOpts *opts; - Visitor *v; Object *obj = NULL; opts = qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err); @@ -1817,9 +1816,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) return; } - v = opts_visitor_new(opts); - obj = user_creatable_add(qdict, v, &err); - visit_free(v); + obj = user_creatable_add_opts(opts, &err); qemu_opts_del(opts); if (err) { diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 4b880d0..9b4155a 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -34,57 +34,6 @@ bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp) } } - -Object *user_creatable_add(const QDict *qdict, - Visitor *v, Error **errp) -{ - char *type = NULL; - char *id = NULL; - Object *obj = NULL; - Error *local_err = NULL; - QDict *pdict; - - pdict = qdict_clone_shallow(qdict); - - visit_start_struct(v, NULL, NULL, 0, &local_err); - if (local_err) { - goto out; - } - - qdict_del(pdict, "qom-type"); - visit_type_str(v, "qom-type", &type, &local_err); - if (local_err) { - goto out_visit; - } - - qdict_del(pdict, "id"); - visit_type_str(v, "id", &id, &local_err); - if (local_err) { - goto out_visit; - } - visit_check_struct(v, &local_err); - if (local_err) { - goto out_visit; - } - - obj = user_creatable_add_type(type, id, pdict, v, &local_err); - -out_visit: - visit_end_struct(v, NULL); - -out: - QDECREF(pdict); - g_free(id); - g_free(type); - if (local_err) { - error_propagate(errp, local_err); - object_unref(obj); - return NULL; - } - return obj; -} - - Object *user_creatable_add_type(const char *type, const char *id, const QDict *qdict, Visitor *v, Error **errp) @@ -157,13 +106,27 @@ Object *user_creatable_add_opts(QemuOpts *opts, Error **errp) { Visitor *v; QDict *pdict; - Object *obj = NULL; + Object *obj; + const char *id = qemu_opts_id(opts); + const char *type = qemu_opt_get(opts, "qom-type"); + + if (!type) { + error_setg(errp, QERR_MISSING_PARAMETER, "qom-type"); + return NULL; + } + if (!id) { + error_setg(errp, QERR_MISSING_PARAMETER, "id"); + return NULL; + } - v = opts_visitor_new(opts); pdict = qemu_opts_to_qdict(opts, NULL); + qdict_del(pdict, "qom-type"); + qdict_del(pdict, "id"); - obj = user_creatable_add(pdict, v, errp); + v = opts_visitor_new(opts); + obj = user_creatable_add_type(type, id, pdict, v, errp); visit_free(v); + QDECREF(pdict); return obj; }