diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-01-12 20:50:17 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-12 14:32:19 -0600 |
| commit | c9f79a3f79a48de28b4575cb5644bcf45d3754d0 (patch) | |
| tree | 111e50653e715666b804a73d8162b6bb7676f0b2 | |
| parent | dae5079acacc4e42e9583fbc326f81c08ab973d3 (diff) | |
| download | qemu-c9f79a3f79a48de28b4575cb5644bcf45d3754d0.zip qemu-c9f79a3f79a48de28b4575cb5644bcf45d3754d0.tar.gz qemu-c9f79a3f79a48de28b4575cb5644bcf45d3754d0.tar.bz2 | |
virtio-net: mac property is mandatory
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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/virtio-net.c | 2 | ||||
| -rw-r--r-- | 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), \ |