From patchwork Mon Feb 4 07:41:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 217837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3CE302C029D for ; Mon, 4 Feb 2013 18:37:47 +1100 (EST) Received: from localhost ([::1]:37469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2Gcb-0007dt-CX for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2013 02:37:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2GcS-0007di-6e for qemu-devel@nongnu.org; Mon, 04 Feb 2013 02:37:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2GcO-0002x9-23 for qemu-devel@nongnu.org; Mon, 04 Feb 2013 02:37:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2GcN-0002wz-Qc for qemu-devel@nongnu.org; Mon, 04 Feb 2013 02:37:31 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r147bUZY020188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 4 Feb 2013 02:37:30 -0500 Received: from redhat.com (vpn1-4-137.ams2.redhat.com [10.36.4.137]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r147bQuQ031356; Mon, 4 Feb 2013 02:37:27 -0500 Date: Mon, 4 Feb 2013 09:41:47 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20130204074147.GA7753@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , "Michael S. Tsirkin" , Jan Kiszka , Jason Wang , Yan Vugenfirer , Michael Tokarev , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , Amos Kong , Vadim Rozenfeld Subject: [Qemu-devel] [PATCHv2] virtio-net: remove mq feature flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org mq flag is not needed: we can look at the number of queues and set the flag accordingly. Removing this feature removes ambiguity (what does it mean to have queues=2 with mq=off?), and simplifies compatibility hacks. work-around for buggy windows guests. Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang Tested-by: Jason Wang Tested-By: Michael Tokarev Reviewed-by: Stefan Hajnoczi --- hw/pc_piix.c | 4 ---- hw/virtio-net.c | 8 +++++++- hw/virtio-net.h | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 0af436c..ba09714 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -313,10 +313,6 @@ static QEMUMachine pc_i440fx_machine_v1_4 = { .driver = "virtio-net-pci",\ .property = "ctrl_mac_addr",\ .value = "off", \ - },{ \ - .driver = "virtio-net-pci", \ - .property = "mq", \ - .value = "off", \ } static QEMUMachine pc_machine_v1_3 = { diff --git a/hw/virtio-net.c b/hw/virtio-net.c index e37358a..8db1787 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -346,6 +346,10 @@ static uint32_t virtio_net_get_features(VirtIODevice *vdev, uint32_t features) features |= (1 << VIRTIO_NET_F_MAC); + if (n->max_queues > 1) { + features |= (0x1 << VIRTIO_NET_F_MQ); + } + if (!peer_has_vnet_hdr(n)) { features &= ~(0x1 << VIRTIO_NET_F_CSUM); features &= ~(0x1 << VIRTIO_NET_F_HOST_TSO4); @@ -1285,7 +1289,9 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, int i; n = (VirtIONet *)virtio_common_init("virtio-net", VIRTIO_ID_NET, - sizeof(struct virtio_net_config), + conf->queues > 1 ? + sizeof(struct virtio_net_config) : + sizeof(struct virtio_net_config_compat), sizeof(VirtIONet)); n->vdev.get_config = virtio_net_get_config; diff --git a/hw/virtio-net.h b/hw/virtio-net.h index f5fea6e..b1f7647 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -69,6 +69,17 @@ typedef struct virtio_net_conf /* Maximum packet size we can receive from tap device: header + 64k */ #define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10)) +/* + * Windows drivers from 22 Jan 2013 and older fail when config size != 32. + */ +struct virtio_net_config_compat +{ + /* The config defining mac address ($ETH_ALEN bytes) */ + uint8_t mac[ETH_ALEN]; + /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */ + uint16_t status; +} QEMU_PACKED; + struct virtio_net_config { /* The config defining mac address ($ETH_ALEN bytes) */ @@ -190,7 +201,5 @@ struct virtio_net_ctrl_mq { DEFINE_PROP_BIT("ctrl_rx", _state, _field, VIRTIO_NET_F_CTRL_RX, true), \ DEFINE_PROP_BIT("ctrl_vlan", _state, _field, VIRTIO_NET_F_CTRL_VLAN, true), \ DEFINE_PROP_BIT("ctrl_rx_extra", _state, _field, VIRTIO_NET_F_CTRL_RX_EXTRA, true), \ - DEFINE_PROP_BIT("ctrl_mac_addr", _state, _field, VIRTIO_NET_F_CTRL_MAC_ADDR, true), \ - DEFINE_PROP_BIT("mq", _state, _field, VIRTIO_NET_F_MQ, true) - + DEFINE_PROP_BIT("ctrl_mac_addr", _state, _field, VIRTIO_NET_F_CTRL_MAC_ADDR, true) #endif