From patchwork Thu Oct 29 15:34:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dustin Kirkland X-Patchwork-Id: 56479 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9TFYlpR012314 for ; Thu, 29 Oct 2009 15:34:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755326AbZJ2PeX (ORCPT ); Thu, 29 Oct 2009 11:34:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755330AbZJ2PeW (ORCPT ); Thu, 29 Oct 2009 11:34:22 -0400 Received: from adelie.canonical.com ([91.189.90.139]:55048 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755318AbZJ2PeW (ORCPT ); Thu, 29 Oct 2009 11:34:22 -0400 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1N3X12-0000zj-RO; Thu, 29 Oct 2009 15:34:20 +0000 Received: from cpe-66-69-232-158.austin.res.rr.com ([66.69.232.158] helo=[192.168.1.146]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1N3X12-0007R5-Gl; Thu, 29 Oct 2009 15:34:20 +0000 Subject: [PATCH] whitelist host virtio networking features [was Re: qemu-kvm-0.11 regression, crashes on older ...] From: Dustin Kirkland Reply-To: kirkland@canonical.com To: Mark McLoughlin Cc: Anthony Liguori , Scott Tsai , qemu-devel , kvm , Rusty Russell In-Reply-To: <1256827719.10825.75.camel@blaa> References: <1256807803.10825.39.camel@blaa> <1256815818-sup-7805@xpc65.scottt> <1256818566.10825.58.camel@blaa> <4AE9A299.5060003@codemonkey.ws> <1256826351.10825.69.camel@blaa> <4AE9A90F.1060108@codemonkey.ws> <1256827719.10825.75.camel@blaa> Date: Thu, 29 Oct 2009 10:34:15 -0500 Message-ID: <1256830455.25064.155.camel@x200> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/hw/virtio-net.c b/hw/virtio-net.c index ce8e6cb..27834fa 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -164,10 +164,10 @@ static uint32_t virtio_net_bad_features(VirtIODevice *vdev) /* Linux kernel 2.6.25. It understood MAC (as everyone must), * but also these: */ features |= (1 << VIRTIO_NET_F_MAC); - features |= (1 << VIRTIO_NET_F_GUEST_CSUM); - features |= (1 << VIRTIO_NET_F_GUEST_TSO4); - features |= (1 << VIRTIO_NET_F_GUEST_TSO6); - features |= (1 << VIRTIO_NET_F_GUEST_ECN); + features |= (1 << VIRTIO_NET_F_CSUM); + features |= (1 << VIRTIO_NET_F_HOST_TSO4); + features |= (1 << VIRTIO_NET_F_HOST_TSO6); + features |= (1 << VIRTIO_NET_F_HOST_ECN); return features & virtio_net_get_features(vdev); }