From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKP4K-00079l-Hy for qemu-devel@nongnu.org; Wed, 29 Jul 2015 06:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKP4J-0000tQ-BO for qemu-devel@nongnu.org; Wed, 29 Jul 2015 06:58:40 -0400 Received: from [59.151.112.132] (port=1523 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKP4I-0000qp-78 for qemu-devel@nongnu.org; Wed, 29 Jul 2015 06:58:39 -0400 From: Yang Hongyang Date: Wed, 29 Jul 2015 18:51:56 +0800 Message-ID: <1438167116-29270-13-git-send-email-yanghy@cn.fujitsu.com> In-Reply-To: <1438167116-29270-1-git-send-email-yanghy@cn.fujitsu.com> References: <1438167116-29270-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 12/12] 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, jasowang@redhat.com, mrhines@linux.vnet.ibm.com, stefanha@redhat.com, Yang Hongyang Signed-off-by: Yang Hongyang --- 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 5326a82..d678ebd 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[,prop=value][,...]", + .params = "[buffer],id=str,netdev=str[,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 8c1eb30..6a90521 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[,interval=n]\n" + " buffer guest output 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 9e62e0b..1135320 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -947,7 +947,7 @@ Arguments: Example: -> { "execute": "netfilter_add", - "arguments": { "type": "type", "id": "nf0", "netdev": "bn" } } + "arguments": { "type": "buffer", "id": "nf0", "netdev": "bn" } } <- { "return": {} } Note: The supported filter options are the same ones supported by the -- 1.9.1