From patchwork Mon Jan 25 09:12:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8104841 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 328569F818 for ; Mon, 25 Jan 2016 09:14:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CC1920303 for ; Mon, 25 Jan 2016 09:14:01 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 75A5520251 for ; Mon, 25 Jan 2016 09:13:57 +0000 (UTC) Received: from localhost ([::1]:36093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNdDg-0007tX-GA for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Jan 2016 04:13:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNdDZ-0007tO-13 for qemu-devel@nongnu.org; Mon, 25 Jan 2016 04:13:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNdDU-0003DP-NL for qemu-devel@nongnu.org; Mon, 25 Jan 2016 04:13:48 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:13726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNdDT-0003Cn-Ur for qemu-devel@nongnu.org; Mon, 25 Jan 2016 04:13:44 -0500 Received: from 172.24.1.48 (EHLO szxeml430-hub.china.huawei.com) ([172.24.1.48]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DDR44814; Mon, 25 Jan 2016 17:13:18 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.235.1; Mon, 25 Jan 2016 17:13:07 +0800 From: zhanghailiang To: Date: Mon, 25 Jan 2016 17:12:50 +0800 Message-ID: <1453713170-13156-1-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.56A5E731.00E2, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: bb2ea534a53bb0081779db339fbc30b8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Cc: Jason Wang , Yang Hongyang , zhanghailiang , Markus Armbruster Subject: [Qemu-devel] [PATCH] net/filter: Fix the output information for command 'info network' 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The properties of netfilter object could be changed by 'qom-set' command, but the output of 'info network' command is not updated, because it got the old information through nf->info_str, it will not be updated while we change the value of netfilter's property. Here we split a helper function that could colletct the output information for filter, and also remove the useless member 'info_str' from struct NetFilterState. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Eric Blake Cc: Markus Armbruster Cc: Yang Hongyang --- include/net/filter.h | 3 ++- net/filter.c | 47 ++++++++++++++++++++++++++--------------------- net/net.c | 5 ++++- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/include/net/filter.h b/include/net/filter.h index 2deda36..8a20138 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -55,7 +55,6 @@ struct NetFilterState { char *netdev_id; NetClientState *netdev; NetFilterDirection direction; - char info_str[256]; QTAILQ_ENTRY(NetFilterState) next; }; @@ -74,4 +73,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender, int iovcnt, void *opaque); +void netfilter_print_info(NetFilterState *nf, char *output_str, int size); + #endif /* QEMU_NET_FILTER_H */ diff --git a/net/filter.c b/net/filter.c index 5d90f83..40254bd 100644 --- a/net/filter.c +++ b/net/filter.c @@ -128,6 +128,31 @@ static void netfilter_init(Object *obj) NULL); } +void netfilter_print_info(NetFilterState *nf, char *output_str, int size) +{ + char *str, *info; + ObjectProperty *prop; + ObjectPropertyIterator iter; + StringOutputVisitor *ov; + + /* generate info str */ + object_property_iter_init(&iter, OBJECT(nf)); + while ((prop = object_property_iter_next(&iter))) { + if (!strcmp(prop->name, "type")) { + continue; + } + ov = string_output_visitor_new(false); + object_property_get(OBJECT(nf), string_output_get_visitor(ov), + prop->name, NULL); + str = string_output_get_string(ov); + string_output_visitor_cleanup(ov); + info = g_strdup_printf(",%s=%s", prop->name, str); + g_strlcat(output_str, info, size); + g_free(str); + g_free(info); + } +} + static void netfilter_complete(UserCreatable *uc, Error **errp) { NetFilterState *nf = NETFILTER(uc); @@ -135,10 +160,7 @@ static void netfilter_complete(UserCreatable *uc, Error **errp) NetFilterClass *nfc = NETFILTER_GET_CLASS(uc); int queues; Error *local_err = NULL; - char *str, *info; - ObjectProperty *prop; - ObjectPropertyIterator iter; - StringOutputVisitor *ov; + if (!nf->netdev_id) { error_setg(errp, "Parameter 'netdev' is required"); @@ -172,23 +194,6 @@ static void netfilter_complete(UserCreatable *uc, Error **errp) } } QTAILQ_INSERT_TAIL(&nf->netdev->filters, nf, next); - - /* generate info str */ - object_property_iter_init(&iter, OBJECT(nf)); - while ((prop = object_property_iter_next(&iter))) { - if (!strcmp(prop->name, "type")) { - continue; - } - ov = string_output_visitor_new(false); - object_property_get(OBJECT(nf), string_output_get_visitor(ov), - prop->name, errp); - str = string_output_get_string(ov); - string_output_visitor_cleanup(ov); - info = g_strdup_printf(",%s=%s", prop->name, str); - g_strlcat(nf->info_str, info, sizeof(nf->info_str)); - g_free(str); - g_free(info); - } } static void netfilter_finalize(Object *obj) diff --git a/net/net.c b/net/net.c index 87dd356..87de7c0 100644 --- a/net/net.c +++ b/net/net.c @@ -1198,9 +1198,12 @@ void print_net_client(Monitor *mon, NetClientState *nc) } QTAILQ_FOREACH(nf, &nc->filters, next) { char *path = object_get_canonical_path_component(OBJECT(nf)); + char info[256] = { 0 }; + + netfilter_print_info(nf, info, sizeof(info)); monitor_printf(mon, " - %s: type=%s%s\n", path, object_get_typename(OBJECT(nf)), - nf->info_str); + info); g_free(path); } }