From nobody Wed Apr 16 12:38:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564389290; cv=none; d=zoho.com; s=zohoarc; b=EnWDGecFHpRCy0DCFeJNSrB71wAK90KLWozRhWXprIqNDwoBj0eivqF8dzuqfaTx1+S/JINGsjlYDdJDtO6l2ohDohMs0CqDtNzsi59dWJVskDCarG71vpaoZTwpQDXPgqoYqyBHbCjvoSgXu3bpsvQbpqA0TBagLlUMfO9b9rk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389290; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qwE/PkDggxDh6tBvUGi68c2h6fKNNtu2DBNRJvCXG/o=; b=QV+tE8E8CS9Ksv51z3eIoCp8q3Z8lVgAT8CkWTVVwra1J09X+uRPD+nqDX6J+dLH22DcYBgWh54v5Iao8hEwg9qBmyWU6WDA8ptXpZ2w1Pwy/Wojeq1jZPyafHLiKhqMXWpnyRFvnHbdmbzB2WEts5h8qnIoBe1nu+BPp/xEklg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564389290366307.4134905155604; Mon, 29 Jul 2019 01:34:50 -0700 (PDT) Received: from localhost ([::1]:50468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs17J-0005ce-Bh for importer@patchew.org; Mon, 29 Jul 2019 04:34:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48005) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16P-0004QO-Fc for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16O-0003E6-GL for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16O-0003Dh-BL for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0D68A3B46; Mon, 29 Jul 2019 08:33:51 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45CC710190AA; Mon, 29 Jul 2019 08:33:50 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:42 +0800 Message-Id: <1564389226-4489-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 29 Jul 2019 08:33:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We should not raise any interrupt after VM has been stopped but this is what e1000 currently did when mit timer is active in pre_save(). Fixing this by scheduling a timer in post_load() which can make sure the interrupt was raised when VM is running. Reported-and-tested-by: Longpeng Signed-off-by: Jason Wang --- hw/net/e1000.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 1dc1466..a023ceb 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1381,11 +1381,6 @@ static int e1000_pre_save(void *opaque) E1000State *s =3D opaque; NetClientState *nc =3D qemu_get_queue(s->nic); =20 - /* If the mitigation timer is active, emulate a timeout now. */ - if (s->mit_timer_on) { - e1000_mit_timer(s); - } - /* * If link is down and auto-negotiation is supported and ongoing, * complete auto-negotiation immediately. This allows us to look @@ -1423,7 +1418,8 @@ static int e1000_post_load(void *opaque, int version_= id) s->mit_irq_level =3D false; } s->mit_ide =3D 0; - s->mit_timer_on =3D false; + s->mit_timer_on =3D true; + timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1); =20 /* nc.link_down can't be migrated, so infer link_down according * to link status bit in mac_reg[STATUS]. --=20 2.5.0