Re: [Qemu-devel] [PATCH] virtio-net: only output the vlan table when VIRTIO_NET_F_CTRL_VLAN is negotiated

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

On 02/16/2014 07:27 PM, Amos Kong wrote:
> Stefan Fritsch just fixed a virtio-net driver bug [1], virtio-net won't
> filter out VLAN-tagged packets if VIRTIO_NET_F_CTRL_VLAN isn't negotiated.
> 
> We should also not send the vlan table to management, this patch makes
> the vlan-talbe optional.

s/talbe/table/

> 
> [1] http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg02604.html
> 
> Signed-off-by: Amos Kong <akong@redhat.com>
> ---
>  hw/net/virtio-net.c | 38 +++++++++++++++++++++++++-------------
>  qapi-schema.json    |  4 ++--
>  qmp-commands.hx     |  2 +-
>  3 files changed, 28 insertions(+), 16 deletions(-)
> 

> +++ b/qapi-schema.json
> @@ -4034,7 +4034,7 @@
>  #
>  # @main-mac: the main macaddr string
>  #
> -# @vlan-table: a list of active vlan id
> +# @vlan-table: #optional a list of active vlan id
>  #
>  # @unicast-table: a list of unicast macaddr string
>  #
> @@ -4053,7 +4053,7 @@
>      'multicast-overflow': 'bool',
>      'unicast-overflow':   'bool',
>      'main-mac':           'str',
> -    'vlan-table':         ['int'],
> +    '*vlan-table':         ['int'],

Indentation is now off.

>  - "main-mac": main macaddr string (json-string)
> -- "vlan-table": a json-array of active vlan id
> +- "vlan-table": a json-array of active vlan id (optoinal)

s/optoinal/optional/

Those fixes are trivial enough, so I'm okay if you correct them then add:

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]