| Message ID | 1438677044-13030-11-git-send-email-yanghy@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 08/04/2015 04:30 PM, Yang Hongyang wrote: > now that we have a buffer netfilter, update the command > description and help. > > Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> > CC: Luiz Capitulino <lcapitulino@redhat.com> > CC: Markus Armbruster <armbru@redhat.com> > --- > 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][,...]", Looks like chain is mandatory in patch 2. > .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": {} }
On 08/06/2015 03:22 PM, Jason Wang wrote: > > > On 08/04/2015 04:30 PM, Yang Hongyang wrote: >> now that we have a buffer netfilter, update the command >> description and help. >> >> Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> >> CC: Luiz Capitulino <lcapitulino@redhat.com> >> CC: Markus Armbruster <armbru@redhat.com> >> --- >> 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][,...]", > > Looks like chain is mandatory in patch 2. It is optional, default is "all". > >> .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": {} } > > . >
On 08/06/2015 03:31 PM, Yang Hongyang wrote: > > > On 08/06/2015 03:22 PM, Jason Wang wrote: >> >> >> On 08/04/2015 04:30 PM, Yang Hongyang wrote: >>> now that we have a buffer netfilter, update the command >>> description and help. >>> >>> Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> >>> CC: Luiz Capitulino <lcapitulino@redhat.com> >>> CC: Markus Armbruster <armbru@redhat.com> >>> --- >>> 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][,...]", >> >> Looks like chain is mandatory in patch 2. > > It is optional, default is "all". Right, I see.
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": {} }
now that we have a buffer netfilter, update the command description and help. Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> CC: Luiz Capitulino <lcapitulino@redhat.com> CC: Markus Armbruster <armbru@redhat.com> --- hmp-commands.hx | 2 +- qemu-options.hx | 5 ++++- qmp-commands.hx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)