From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSdzq-0006YQ-DS for qemu-devel@nongnu.org; Fri, 21 Aug 2015 00:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSdzp-00048U-Fx for qemu-devel@nongnu.org; Fri, 21 Aug 2015 00:32:06 -0400 Received: from [59.151.112.132] (port=23676 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSdzo-0003xu-EF for qemu-devel@nongnu.org; Fri, 21 Aug 2015 00:32:05 -0400 From: Yang Hongyang Date: Fri, 21 Aug 2015 12:30:11 +0800 Message-ID: <1440131412-7330-11-git-send-email-yanghy@cn.fujitsu.com> In-Reply-To: <1440131412-7330-1-git-send-email-yanghy@cn.fujitsu.com> References: <1440131412-7330-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v7 10/11] filter/buffer: update command description and help List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 now that we have a buffer netfilter, update the command description and help. Signed-off-by: Yang Hongyang CC: Luiz Capitulino CC: Markus Armbruster --- hmp-commands.hx | 2 +- qemu-options.hx | 5 ++++- qmp-commands.hx | 2 +- 3 files changed, 6 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..eeaf2a1 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 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": {} } -- 1.9.1