From patchwork Wed Jul 6 09:13:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 9215859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD7A760752 for ; Wed, 6 Jul 2016 09:20:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB98F28796 for ; Wed, 6 Jul 2016 09:20:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD2B8287AA; Wed, 6 Jul 2016 09:20:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A11C28796 for ; Wed, 6 Jul 2016 09:20:26 +0000 (UTC) Received: from localhost ([::1]:60410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKj0A-00051e-P8 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Jul 2016 05:20:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKiuN-00074D-5A for qemu-devel@nongnu.org; Wed, 06 Jul 2016 05:14:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKiuK-0000Rg-SH for qemu-devel@nongnu.org; Wed, 06 Jul 2016 05:14:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKiuK-0000RK-Jr for qemu-devel@nongnu.org; Wed, 06 Jul 2016 05:14:12 -0400 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 4E679C04B306 for ; Wed, 6 Jul 2016 09:14:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u669E9Fs024805 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 6 Jul 2016 05:14:11 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 87FD71129C46; Wed, 6 Jul 2016 11:14:06 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 6 Jul 2016 11:13:59 +0200 Message-Id: <1467796446-25446-9-git-send-email-armbru@redhat.com> In-Reply-To: <1467796446-25446-1-git-send-email-armbru@redhat.com> References: <1467796446-25446-1-git-send-email-armbru@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.31]); Wed, 06 Jul 2016 09:14:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 08/15] string-output-visitor: Favor new visit_free() function 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Blake Now that we have a polymorphic visit_free(), we no longer need string_output_visitor_cleanup(); however, we still need to expose the subtype for string_output_get_string(). Signed-off-by: Eric Blake Message-Id: <1465490926-28625-9-git-send-email-eblake@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- hmp.c | 2 +- include/qapi/string-output-visitor.h | 1 - net/net.c | 2 +- qapi/string-output-visitor.c | 5 ----- qom/object.c | 11 ++++++----- tests/test-string-output-visitor.c | 2 +- tests/test-visitor-serialization.c | 4 ++-- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/hmp.c b/hmp.c index fd5daa7..559cad1 100644 --- a/hmp.c +++ b/hmp.c @@ -2006,7 +2006,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) monitor_printf(mon, " host nodes: %s\n", str); g_free(str); - string_output_visitor_cleanup(ov); + visit_free(string_output_get_visitor(ov)); m = m->next; i++; } diff --git a/include/qapi/string-output-visitor.h b/include/qapi/string-output-visitor.h index e10522a..03e377e 100644 --- a/include/qapi/string-output-visitor.h +++ b/include/qapi/string-output-visitor.h @@ -23,7 +23,6 @@ typedef struct StringOutputVisitor StringOutputVisitor; * requires a non-null list argument to visit_start_list(). */ StringOutputVisitor *string_output_visitor_new(bool human); -void string_output_visitor_cleanup(StringOutputVisitor *v); char *string_output_get_string(StringOutputVisitor *v); Visitor *string_output_get_visitor(StringOutputVisitor *v); diff --git a/net/net.c b/net/net.c index d25f802..336469f 100644 --- a/net/net.c +++ b/net/net.c @@ -1210,7 +1210,7 @@ static void netfilter_print_info(Monitor *mon, NetFilterState *nf) object_property_get(OBJECT(nf), string_output_get_visitor(ov), prop->name, NULL); str = string_output_get_string(ov); - string_output_visitor_cleanup(ov); + visit_free(string_output_get_visitor(ov)); monitor_printf(mon, ",%s=%s", prop->name, str); g_free(str); } diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c index ff9ddf0..78aab87 100644 --- a/qapi/string-output-visitor.c +++ b/qapi/string-output-visitor.c @@ -326,11 +326,6 @@ static void string_output_free(Visitor *v) { StringOutputVisitor *sov = to_sov(v); - string_output_visitor_cleanup(sov); -} - -void string_output_visitor_cleanup(StringOutputVisitor *sov) -{ if (sov->string) { g_string_free(sov->string, true); } diff --git a/qom/object.c b/qom/object.c index 02c0a3a..2407b66 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1242,14 +1242,15 @@ int object_property_get_enum(Object *obj, const char *name, enumprop = prop->opaque; sov = string_output_visitor_new(false); - object_property_get(obj, string_output_get_visitor(sov), name, &err); + v = string_output_get_visitor(sov); + object_property_get(obj, v, name, &err); if (err) { error_propagate(errp, err); - string_output_visitor_cleanup(sov); + visit_free(v); return 0; } str = string_output_get_string(sov); - string_output_visitor_cleanup(sov); + visit_free(v); v = string_input_visitor_new(str); visit_type_enum(v, name, &ret, enumprop->strings, errp); @@ -1281,7 +1282,7 @@ void object_property_get_uint16List(Object *obj, const char *name, g_free(str); visit_free(v); out: - string_output_visitor_cleanup(ov); + visit_free(string_output_get_visitor(ov)); } void object_property_parse(Object *obj, const char *string, @@ -1309,7 +1310,7 @@ char *object_property_print(Object *obj, const char *name, bool human, string = string_output_get_string(sov); out: - string_output_visitor_cleanup(sov); + visit_free(string_output_get_visitor(sov)); return string; } diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c index edff523..bfa3e8e 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -50,7 +50,7 @@ static void visitor_output_setup_human(TestOutputVisitorData *data, static void visitor_output_teardown(TestOutputVisitorData *data, const void *unused) { - string_output_visitor_cleanup(data->sov); + visit_free(data->ov); data->sov = NULL; data->ov = NULL; } diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index 0766dcc..377ee3e 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -1047,7 +1047,7 @@ static void qmp_deserialize(void **native_out, void *datap, static void qmp_cleanup(void *datap) { QmpSerializeData *d = datap; - qmp_output_visitor_cleanup(d->qov); + visit_free(qmp_output_get_visitor(d->qov)); visit_free(d->qiv); g_free(d); @@ -1083,7 +1083,7 @@ static void string_cleanup(void *datap) { StringSerializeData *d = datap; - string_output_visitor_cleanup(d->sov); + visit_free(string_output_get_visitor(d->sov)); visit_free(d->siv); g_free(d->string); g_free(d);