From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MHEtq-0001Mb-Fi for qemu-devel@nongnu.org; Thu, 18 Jun 2009 06:31:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MHEtk-0001GQ-Sv for qemu-devel@nongnu.org; Thu, 18 Jun 2009 06:31:16 -0400 Received: from [199.232.76.173] (port=46557 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MHEtk-0001GH-JP for qemu-devel@nongnu.org; Thu, 18 Jun 2009 06:31:12 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55742) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MHEtj-0003QL-NE for qemu-devel@nongnu.org; Thu, 18 Jun 2009 06:31:12 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5IAVADu022730 for ; Thu, 18 Jun 2009 06:31:10 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5IAV9YH003031 for ; Thu, 18 Jun 2009 06:31:09 -0400 Received: from [127.0.0.1] (sebastian-int.corp.redhat.com [172.16.52.221]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5IAV8uD030909 for ; Thu, 18 Jun 2009 06:31:09 -0400 From: Mark McLoughlin Content-Type: text/plain Date: Thu, 18 Jun 2009 11:31:07 +0100 Message-Id: <1245321067.675.52.camel@blaa> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] virtio-net: enable mergeable receive buffers Reply-To: Mark McLoughlin List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel When virtio-net was merged in from qemu-kvm.git, the VNET_HDR related features were dropped from the code. However, VIRTIO_NET_F_MRG_RXBUF appears to have accidentally been dropped too. Re-instate that now. Reported-by: Michael S. Tsirkin Signed-off-by: Mark McLoughlin --- hw/virtio-net.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index d584287..e1efbbe 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -119,6 +119,7 @@ static void virtio_net_reset(VirtIODevice *vdev) static uint32_t virtio_net_get_features(VirtIODevice *vdev) { uint32_t features = (1 << VIRTIO_NET_F_MAC) | + (1 << VIRTIO_NET_F_MRG_RXBUF) | (1 << VIRTIO_NET_F_STATUS) | (1 << VIRTIO_NET_F_CTRL_VQ) | (1 << VIRTIO_NET_F_CTRL_RX) | -- 1.6.0.6