From patchwork Tue Jun 4 16:22:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Larrew X-Patchwork-Id: 248710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 942DB2C00A1 for ; Wed, 5 Jun 2013 02:23:41 +1000 (EST) Received: from localhost ([::1]:49151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uju1L-0006IP-MC for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 12:23:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uju0u-0006HK-UL for qemu-devel@nongnu.org; Tue, 04 Jun 2013 12:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uju0t-0006BA-Fr for qemu-devel@nongnu.org; Tue, 04 Jun 2013 12:23:12 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:56358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uju0t-0006Ay-C0 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 12:23:11 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 4 Jun 2013 12:23:11 -0400 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 4 Jun 2013 12:23:10 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 2E8E0C90068 for ; Tue, 4 Jun 2013 12:23:09 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r54GN8M353412052 for ; Tue, 4 Jun 2013 12:23:08 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r54GN53f032264 for ; Tue, 4 Jun 2013 13:23:08 -0300 Received: from jlarrew.austin.ibm.com (jlarrew.austin.ibm.com [9.41.149.140]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r54GMwYW031715; Tue, 4 Jun 2013 13:23:01 -0300 From: Jesse Larrew To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 11:22:45 -0500 Message-Id: <1370362965-3937-4-git-send-email-jlarrew@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1370362965-3937-1-git-send-email-jlarrew@linux.vnet.ibm.com> References: <1370362965-3937-1-git-send-email-jlarrew@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13060416-7182-0000-0000-000007214E0F X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.139 Cc: jasowang@redhat.com, Jesse Larrew , mdroth@linux.vnet.ibm.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH 3/3] virtio-net: revert MAC address workaround 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 With a more permanent solution in place, the workaround in commit e9016ee2bda1b7757072b856b2196f691aee3388 is no longer needed. Signed-off-by: Jesse Larrew --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index e09288f..c1c80aa 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1325,7 +1325,7 @@ void virtio_net_set_config_size(VirtIONet *n, uint32_t host_features) { VirtIODevice *vdev = VIRTIO_DEVICE(n); int i, config_size = 0; - host_features |= (1 << VIRTIO_NET_F_MAC); + 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);