From nobody Thu Nov 6 01:11:11 2025 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.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538298372213940.2212541957603; Sun, 30 Sep 2018 02:06:12 -0700 (PDT) Received: from localhost ([::1]:54514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6Xfx-0001eo-Ly for importer@patchew.org; Sun, 30 Sep 2018 05:06:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6WsJ-0003C9-4I for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6WsF-0001Jc-92 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:46 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:33810) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6WsC-0001Hb-Uh for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:41 -0400 Received: by mail-wm1-x32e.google.com with SMTP id z25-v6so827785wmf.1 for ; Sun, 30 Sep 2018 01:14:40 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5hC7REoGT9ZHv4x/d6StiZypiS4LYaMNfKwS1CuqqzE=; b=UrXkIcJYDoT2ZGD7D2GxJz91MdFDKY63ZqzVyyu6LMvvB74PZmQbeNVoCqmJblt6yz Rn5K6JefYHQxyLb6qEScXivTwPqALBnzKoF0+z8wrRp7eXHhUynVd5UnwcyqTAMEJNPP CEhB3Kriji59qHr0Ca0JiFAJjTWpnVIs/VIeJfGjHrqVskSelPkzumaYe+Zag0vS/zbc va6On8ldrxh4iEUTBvP8rTNEVo2Fe6y9N5V0ZHDXJriORmCG42JqyXB9kZg4oAOvITLk +0vp+xM2YpAtZZMQrw31D5cHOGDly0RQUvHFq5Mpr8rQWR8bxDBdUyP8WMeaFcGlMB2B 1mag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5hC7REoGT9ZHv4x/d6StiZypiS4LYaMNfKwS1CuqqzE=; b=lVhjMRYtJC3T6PQHJaBCzeLPnFr2RlRT3DpPxNtkhLhUW89kLwSpA94evZo+Z2Z/tq YNJlTSW1HIkRgDbU8wZOS06u7Ws44jh3+oYtiNpdZ48BaeH0BXfO0NzpKitoccvxp+XT g1aZ9FIPdJP/w2a6ZcHVvatJgXm96WSXFZpPBw9b8u+Ae8OuwTOGtrzzyH+2JzQupeBF mSytzXcILuIBHg4n/2n5lFZVJxArot+0cEhslqqycZ9liym7Gq4qTPgKqaeu7joVQKCX VnZGMxWjt6aqtzrkBvMe63Reqn+uc5jaUo9g3ijtowTO/GvvQtk+phbV3ux2g8cw/axK +lDg== X-Gm-Message-State: ABuFfog00LHG0hU6v+dqO14CkO9/Al0IM/DErpC4YDyNRMRa7xzHiNXW qlWBqBawXDdWFnlkAUZOPowVDiw1 X-Google-Smtp-Source: ACcGV60Lfn+pijP1lBmK5qkVWczqjMDcCDyUf+yHlWuBeOyReQbgz9wMue7pZqmO2b4S1SKstVYPHw== X-Received: by 2002:a1c:6a08:: with SMTP id f8-v6mr6079860wmc.49.1538295279436; Sun, 30 Sep 2018 01:14:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:13:16 +0200 Message-Id: <1538295197-23704-79-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PULL 78/79] cpus: fix TCG kick timer leak 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 From: Alex Benn=C3=A9e This is an alternative fix to Marc-Andr=C3=A9's original patch. Reported-by: Marc-Andr=C3=A9 Lureau Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Message-Id: <20180927171724.30128-1-alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini --- cpus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 68f08f5..361678e 100644 --- a/cpus.c +++ b/cpus.c @@ -983,6 +983,8 @@ static void start_tcg_kick_timer(void) if (!tcg_kick_vcpu_timer && CPU_NEXT(first_cpu)) { tcg_kick_vcpu_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, kick_tcg_thread, NULL); + } + if (tcg_kick_vcpu_timer && !timer_pending(tcg_kick_vcpu_timer)) { timer_mod(tcg_kick_vcpu_timer, qemu_tcg_next_kick()); } } @@ -990,9 +992,8 @@ static void start_tcg_kick_timer(void) static void stop_tcg_kick_timer(void) { assert(!mttcg_enabled); - if (tcg_kick_vcpu_timer) { + if (tcg_kick_vcpu_timer && timer_pending(tcg_kick_vcpu_timer)) { timer_del(tcg_kick_vcpu_timer); - tcg_kick_vcpu_timer =3D NULL; } } =20 --=20 1.8.3.1