qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v8 10/11] filter/buffer: update command description


From: Yang Hongyang
Subject: [Qemu-devel] [PATCH v8 10/11] filter/buffer: update command description and help
Date: Wed, 26 Aug 2015 17:59:41 +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>
---
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[,address@hidden,address@hidden,address@hidden 
[,address@hidden,address@hidden,address@hidden
 @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.
+
address@hidden -netfilter 
buffer,address@hidden,address@hidden,address@hidden/out/all}][,address@hidden
+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}.
+
address@hidden means this filter will receive packets sent to the netdev
+
address@hidden means this filter will receive packets sent from the netdev
+
address@hidden 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": {} }
-- 
1.9.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]