[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 RESEND 10/11] filter/buffer: update command descr
From: |
Yang Hongyang |
Subject: |
[Qemu-devel] [PATCH v7 RESEND 10/11] filter/buffer: update command description and help |
Date: |
Fri, 21 Aug 2015 12:43:24 +0800 |
now that we have a buffer netfilter, update the command
description and help.
Signed-off-by: Yang Hongyang <address@hidden>
CC: Luiz Capitulino <address@hidden>
CC: Markus Armbruster <address@hidden>
---
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[,address@hidden,address@hidden,address@hidden
[,address@hidden,address@hidden,address@hidden
@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
- [Qemu-devel] [PATCH v7 RESEND 00/11] Add a netfilter object and netbuffer filter, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 01/11] net: add a new object netfilter, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 05/11] move out net queue structs define, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 02/11] init/cleanup of netfilter object, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 04/11] netfilter: hook packets before net queue send, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 06/11] netfilter: add an API to pass the packet to next filter, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 03/11] netfilter: add netfilter_{add|del} commands, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 10/11] filter/buffer: update command description and help,
Yang Hongyang <=
- [Qemu-devel] [PATCH v7 RESEND 08/11] net/queue: export qemu_net_queue_append_iov, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 07/11] netfilter: print filter info associate with the netdev, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 09/11] netfilter: add a netbuffer filter, Yang Hongyang, 2015/08/21
- [Qemu-devel] [PATCH v7 RESEND 11/11] tests: add test cases for netfilter object, Yang Hongyang, 2015/08/21