From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35193)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WSlVH-0002BC-T9
	for qemu-devel@nongnu.org; Wed, 26 Mar 2014 06:56:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WSlVC-00076E-Mc
	for qemu-devel@nongnu.org; Wed, 26 Mar 2014 06:56:15 -0400
Date: Wed, 26 Mar 2014 12:55:18 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140326105518.GA7614@redhat.com>
References: <1395829792-14301-1-git-send-email-akong@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1395829792-14301-1-git-send-email-akong@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 for 2.0] virtio-net: Do not filter VLANs
 without F_CTRL_VLAN
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Amos Kong <akong@redhat.com>
Cc: vyasevic@redhat.com, aliguori@amazon.com, qemu-devel@nongnu.org, qemu-stable@nongnu.org, stefanha@redhat.com, sf@sfritsch.de

On Wed, Mar 26, 2014 at 06:29:52PM +0800, Amos Kong wrote:
> From: Stefan Fritsch <sf@sfritsch.de>
> 
> If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
> VLAN-tagged packets but send them to the guest.
> 
> This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
> the OpenBSD driver started as a port from NetBSD).
> 
> Signed-off-by: Stefan Fritsch <sf@sfritsch.de>
> Signed-off-by: Amos Kong <akong@redhat.com>

I think this is also -stable material, isn't it?

> ---
> V2: it's not good to check guest features at reset time,
>     so reset vlan table in setting features
> ---
>  hw/net/virtio-net.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 43b4eda..439477b 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -530,6 +530,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
>          }
>          vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
>      }
> +
> +    if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
> +        memset(n->vlans, 0, MAX_VLAN >> 3);
> +    } else {
> +        memset(n->vlans, 0xff, MAX_VLAN >> 3);
> +    }
>  }
>  
>  static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
> -- 
> 1.8.5.3