From patchwork Wed Aug 26 09:59:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 510778 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 3B0AE1401DA for ; Wed, 26 Aug 2015 20:07:20 +1000 (AEST) Received: from localhost ([::1]:37087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXby-0002yN-6R for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2015 06:07:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXVN-0000fL-Ht for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:00:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUXVJ-00047P-Iw for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:00:29 -0400 Received: from [59.151.112.132] (port=31931 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXVH-0003zs-UQ for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:00:25 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100038179" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Aug 2015 18:03:29 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t7QA0Dkm019730; Wed, 26 Aug 2015 18:00:13 +0800 Received: from localhost (10.167.226.223) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 26 Aug 2015 18:00:19 +0800 From: Yang Hongyang To: Date: Wed, 26 Aug 2015 17:59:41 +0800 Message-ID: <1440583182-5828-11-git-send-email-yanghy@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1440583182-5828-1-git-send-email-yanghy@cn.fujitsu.com> References: <1440583182-5828-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: thuth@redhat.com, zhang.zhanghailiang@huawei.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, Markus Armbruster , mrhines@linux.vnet.ibm.com, Luiz Capitulino , stefanha@redhat.com, Yang Hongyang Subject: [Qemu-devel] [PATCH v8 10/11] filter/buffer: update command description and help 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 now that we have a buffer netfilter, update the command description and help. Signed-off-by: Yang Hongyang CC: Luiz Capitulino CC: Markus Armbruster --- v8: add more description for the filter to the TEXI section --- hmp-commands.hx | 2 +- qemu-options.hx | 18 +++++++++++++++++- qmp-commands.hx | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 902e2d1..63177a8 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1255,7 +1255,7 @@ ETEXI { .name = "netfilter_add", .args_type = "netfilter:O", - .params = "[type],id=str,netdev=str[,chain=in|out|all,prop=value][,...]", + .params = "[buffer],id=str,netdev=str[,chain=in|out|all,prop=value][,...]", .help = "add netfilter", .mhandler.cmd = hmp_netfilter_add, .command_completion = netfilter_add_completion, diff --git a/qemu-options.hx b/qemu-options.hx index 0d52d02..390e055 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1575,7 +1575,10 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "socket][,vlan=n][,option][,option][,...]\n" " old way to initialize a host network interface\n" " (use the -netdev option if possible instead)\n", QEMU_ARCH_ALL) -DEF("netfilter", HAS_ARG, QEMU_OPTION_netfilter, "", QEMU_ARCH_ALL) +DEF("netfilter", HAS_ARG, QEMU_OPTION_netfilter, + "-netfilter buffer,id=str,netdev=str[,chain=in|out|all,interval=n]\n" + " buffer netdev in/out packets. if interval provided, will release\n" + " packets by interval. interval scale: microsecond\n", QEMU_ARCH_ALL) STEXI @item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}] @findex -net @@ -1990,6 +1993,19 @@ libpcap, so it can be analyzed with tools such as tcpdump or Wireshark. Indicate that no network devices should be configured. It is used to override the default configuration (@option{-net nic -net user}) which is activated if no @option{-net} options are provided. + +@item -netfilter buffer,id=@var{id},netdev=@var{netdevid}[,chain=@var{in/out/all}][,interval=@var{n}] +Buffer netdev @var{netdevid} input or output packets. if interval @var{n} +provided, will release packets by interval. interval scale: microsecond. + +chain @var{in/out/all} is an option that can be applied to any netfilters, if +not provided, default is @option{all}. + +@option{in} means this filter will receive packets sent to the netdev + +@option{out} means this filter will receive packets sent from the netdev + +@option{all} means this filter will receive packets both sent to/from the netdev ETEXI STEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index 4f0dc98..9419a6f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -947,7 +947,7 @@ Arguments: Example: -> { "execute": "netfilter_add", - "arguments": { "type": "type", "id": "nf0", + "arguments": { "type": "buffer", "id": "nf0", "netdev": "bn", "chain": "in" } } <- { "return": {} }