Received: from eggs.gnu.org ([208.118.235.92]:52866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVFrO-0008Dd-BH for qemu-devel@nongnu.org; Thu, 25 Apr 2013 02:40:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVFrJ-0007hn-L5 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 02:40:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVFrJ-0007gl-2E for qemu-devel@nongnu.org; Thu, 25 Apr 2013 02:40:45 -0400 From: Jason Wang Date: Thu, 25 Apr 2013 14:21:29 +0800 Message-Id: <1366870889-950-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH] virtio-net: count VIRTIO_NET_F_MAC when calculating config_len List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, qemu-devel@nongnu.org Cc: Jason Wang , Jesse Larrew , mst@redhat.com Commit 14f9b664 (hw/virtio-net.c: set config size using host features) tries to calculate config size based on the host features. But it forgets the VIRTIO_NET_F_MAC were always set for qemu later. This will lead a zero config len for virtio-net device when both VIRTIO_NET_F_STATUS and VIRTIO_NET_F_MQ were disabled form command line. Then qemu will crash when user tries to read the config of virtio-net. Fix this by counting VIRTIO_NET_F_MAC and make sure the config at least contains the mac address. Cc: Jesse Larrew Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 70c8fce..33a70ef 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1264,7 +1264,8 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, void virtio_net_set_config_size(VirtIONet *n, uint32_t host_features) { - int i, config_size = 0; + /* VIRTIO_NET_F_MAC can't be disabled from qemu side */ + int i, config_size = feature_sizes[0].end; for (i = 0; feature_sizes[i].flags != 0; i++) { if (host_features & feature_sizes[i].flags) { config_size = MAX(feature_sizes[i].end, config_size); -- 1.7.1