From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUnTl-0001uo-7V
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 15:36:41 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUnTg-0001sS-Ir
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 15:36:40 -0500
Received: from [199.232.76.173] (port=51664 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUnTg-0001sC-4K
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 15:36:36 -0500
Received: from mail-qy0-f194.google.com ([209.85.221.194]:34980)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NUnTf-0004qs-Pz
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 15:36:35 -0500
Received: by qyk32 with SMTP id 32so2630956qyk.4
	for <qemu-devel@nongnu.org>; Tue, 12 Jan 2010 12:36:34 -0800 (PST)
Message-ID: <4B4CDD4F.5050001@codemonkey.ws>
Date: Tue, 12 Jan 2010 14:36:31 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] virtio-net: mac property is mandatory
References: <20100112185017.GA3202@redhat.com>
In-Reply-To: <20100112185017.GA3202@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>

On 01/12/2010 12:50 PM, Michael S. Tsirkin wrote:
> Mac feature bit isn't going to work as all network cards already have a
> 'mac' property to set the mac address.  Remove it from mask and add in
> get_features.
>
> Reported-by: Gerd Hoffmann<kraxel@redhat.com>
> Signed-off-by: Michael S. Tsirkin<mst@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   hw/virtio-net.c |    2 ++
>   hw/virtio-net.h |    1 -
>   2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/hw/virtio-net.c b/hw/virtio-net.c
> index c2a389f..02d9180 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -151,6 +151,8 @@ static uint32_t virtio_net_get_features(VirtIODevice *vdev, uint32_t features)
>   {
>       VirtIONet *n = to_virtio_net(vdev);
>
> +    features |= (1<<  VIRTIO_NET_F_MAC);
> +
>       if (peer_has_vnet_hdr(n)) {
>           tap_using_vnet_hdr(n->nic->nc.peer, 1);
>       } else {
> diff --git a/hw/virtio-net.h b/hw/virtio-net.h
> index 9130d75..e55119b 100644
> --- a/hw/virtio-net.h
> +++ b/hw/virtio-net.h
> @@ -157,7 +157,6 @@ struct virtio_net_ctrl_mac {
>           DEFINE_VIRTIO_COMMON_FEATURES(_state, _field), \
>           DEFINE_PROP_BIT("csum", _state, _field, VIRTIO_NET_F_CSUM, true), \
>           DEFINE_PROP_BIT("guest_csum", _state, _field, VIRTIO_NET_F_GUEST_CSUM, true), \
> -        DEFINE_PROP_BIT("mac", _state, _field, VIRTIO_NET_F_MAC, true), \
>           DEFINE_PROP_BIT("gso", _state, _field, VIRTIO_NET_F_GSO, true), \
>           DEFINE_PROP_BIT("guest_tso4", _state, _field, VIRTIO_NET_F_GUEST_TSO4, true), \
>           DEFINE_PROP_BIT("guest_tso6", _state, _field, VIRTIO_NET_F_GUEST_TSO6, true), \
>