From nobody Sun Apr 28 17:58:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490923162996412.03366432988867; Thu, 30 Mar 2017 18:19:22 -0700 (PDT) Received: from localhost ([::1]:38405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctlDl-0001KO-N4 for importer@patchew.org; Thu, 30 Mar 2017 21:19:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctlAg-0007mh-Hl for qemu-devel@nongnu.org; Thu, 30 Mar 2017 21:16:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctlAf-0006FQ-Lf for qemu-devel@nongnu.org; Thu, 30 Mar 2017 21:16:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctlAf-0006E0-GV; Thu, 30 Mar 2017 21:16:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8BBCF61D0E; Fri, 31 Mar 2017 01:16:08 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (vpn1-7-85.pek2.redhat.com [10.72.7.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC3175DD66; Fri, 31 Mar 2017 01:16:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8BBCF61D0E Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jasowang@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8BBCF61D0E From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 09:15:55 +0800 Message-Id: <1490922956-19731-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1490922956-19731-1-git-send-email-jasowang@redhat.com> References: <1490922956-19731-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 31 Mar 2017 01:16:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] virtio-net: avoid call tap_enable when there's only one queue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We call tap_enable() even if for multiqueue is not enabled. This is wrong since it should be used for multiqueue codes to enable a disabled queue. Fixing this by only calling this when multiqueue is used. Fixes: 16dbaf905b72 ("tap: support enabling or disabling a queue") Reported-by: Andrew Baumann Tested-by: Andrew Baumann Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c321680..7d091c9 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -510,6 +510,10 @@ static int peer_attach(VirtIONet *n, int index) return 0; } =20 + if (n->max_queues =3D=3D 1) { + return 0; + } + return tap_enable(nc->peer); } =20 --=20 2.7.4 From nobody Sun Apr 28 17:58:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490923091191668.2078267483838; Thu, 30 Mar 2017 18:18:11 -0700 (PDT) Received: from localhost ([::1]:38403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctlCb-0000Yc-UB for importer@patchew.org; Thu, 30 Mar 2017 21:18:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctlAn-0007sB-Fn for qemu-devel@nongnu.org; Thu, 30 Mar 2017 21:16:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctlAk-0006LH-Eb for qemu-devel@nongnu.org; Thu, 30 Mar 2017 21:16:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctlAk-0006Ka-8q; Thu, 30 Mar 2017 21:16:14 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4AB717AEA7; Fri, 31 Mar 2017 01:16:13 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (vpn1-7-85.pek2.redhat.com [10.72.7.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B0D75DD66; Fri, 31 Mar 2017 01:16:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4AB717AEA7 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jasowang@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4AB717AEA7 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 09:15:56 +0800 Message-Id: <1490922956-19731-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1490922956-19731-1-git-send-email-jasowang@redhat.com> References: <1490922956-19731-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 31 Mar 2017 01:16:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] e1000: disable debug by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonid Bloch , Stefan Hajnoczi , Jason Wang , qemu-stable@nongnu.org, Dmitry Fleytman Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Disable debug output by default, the information were not needed for release. Cc: Peter Maydell Cc: Stefan Hajnoczi Cc: Leonid Bloch Cc: Dmitry Fleytman Cc: qemu-stable@nongnu.org Reviewed-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jason Wang --- hw/net/e1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 9324949..f2e5072 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -40,7 +40,7 @@ =20 static const uint8_t bcast[] =3D {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; =20 -#define E1000_DEBUG +/* #define E1000_DEBUG */ =20 #ifdef E1000_DEBUG enum { --=20 2.7.4 From nobody Sun Apr 28 17:58:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14909230722871013.1545465864479; Thu, 30 Mar 2017 18:17:52 -0700 (PDT) Received: from localhost ([::1]:38401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctlCH-0000IK-7L for importer@patchew.org; Thu, 30 Mar 2017 21:17:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctlAf-0007mW-5M for qemu-devel@nongnu.org; Thu, 30 Mar 2017 21:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctlAc-0006Bh-4T for qemu-devel@nongnu.org; Thu, 30 Mar 2017 21:16:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctlAb-0006BD-VG; Thu, 30 Mar 2017 21:16:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 028BB7EBA2; Fri, 31 Mar 2017 01:16:05 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (vpn1-7-85.pek2.redhat.com [10.72.7.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 433D55DD66; Fri, 31 Mar 2017 01:16:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 028BB7EBA2 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jasowang@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 028BB7EBA2 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 09:15:54 +0800 Message-Id: <1490922956-19731-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1490922956-19731-1-git-send-email-jasowang@redhat.com> References: <1490922956-19731-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 31 Mar 2017 01:16:05 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] e1000: disable debug by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonid Bloch , Stefan Hajnoczi , Jason Wang , qemu-stable@nongnu.org, Dmitry Fleytman Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Disable debug output by default, the information were not needed for release. Cc: Peter Maydell Cc: Stefan Hajnoczi Cc: Leonid Bloch Cc: Dmitry Fleytman Cc: qemu-stable@nongnu.org Reviewed-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jason Wang --- hw/net/e1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 9324949..f2e5072 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -40,7 +40,7 @@ =20 static const uint8_t bcast[] =3D {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; =20 -#define E1000_DEBUG +/* #define E1000_DEBUG */ =20 #ifdef E1000_DEBUG enum { --=20 2.7.4