From patchwork Wed Apr 5 13:24:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 96851 Delivered-To: patch@linaro.org Received: by 10.182.246.10 with SMTP id xs10csp259999obc; Wed, 5 Apr 2017 06:29:16 -0700 (PDT) X-Received: by 10.55.105.6 with SMTP id e6mr26849606qkc.252.1491398956421; Wed, 05 Apr 2017 06:29:16 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z32si17788510qtg.133.2017.04.05.06.29.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Apr 2017 06:29:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvkzr-0007rE-W8 for patch@linaro.org; Wed, 05 Apr 2017 09:29:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvkvs-0004X2-PP for qemu-devel@nongnu.org; Wed, 05 Apr 2017 09:25:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvkvr-0000Gj-Um for qemu-devel@nongnu.org; Wed, 05 Apr 2017 09:25:08 -0400 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:35417) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvkvr-0000Fl-PD for qemu-devel@nongnu.org; Wed, 05 Apr 2017 09:25:07 -0400 Received: by mail-wr0-x22e.google.com with SMTP id k6so14520524wre.2 for ; Wed, 05 Apr 2017 06:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F09GCa5eHvuVekUK+Doi4XLbF9zSIlDsNKTqOGhWdxw=; b=gjXEi2aqNA3bhFS6pt/lG8mkkN8zr8tPF2PwEBoxr2lYQMudj6nfH8p606lhwFwp7z hsnMroA8Ue7lE/+JJxarfShC0EV28+ylY3mBkjw1Rg+gjdjEn0cvi8Taf3EGNIbLjvFP Va8uav2jty4W7eEuDY5//NRy+c/GNDqUOeD/w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F09GCa5eHvuVekUK+Doi4XLbF9zSIlDsNKTqOGhWdxw=; b=kUMCfkyUEThzWNgy35Q3e3MMhxpMzmzhwdtn9iJro5/JJhqEY1IUz2W8UhxHuAXayq r57tZ7D1SlsGghJwdJDinAOFPvSb35BQZifLlsHacoG/HCvN5XsXvcQboje43O3XCcto 5b5j2tkzhoocMEvre0JQmXQX7kUPkxYHrv2VyhAMHmXTLOPTJlQPxd5ms6EMJUBnMlFO UqxRYmIlPzpnUgPS7ix+bZaZdkXKPX+1T5SH7hH6Da2TCqAHIkulw1yVSf6me3NUuCGd y3+j/kVPXmDgMu5Pwc4CfYsQ0pPjl67k3TsTGd7mHFMYJHxC0ZAQnBl3fuzfc3GssWoZ cw0g== X-Gm-Message-State: AFeK/H1P/QS7kJ6ql7sHk5idVAT16CSoZhleD/v1QEJhFCuUJ9oHb/lJaK13dALZt7+ppNeS X-Received: by 10.28.139.195 with SMTP id n186mr20391160wmd.139.1491398706602; Wed, 05 Apr 2017 06:25:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 81sm22385813wmj.9.2017.04.05.06.25.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Apr 2017 06:25:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 842483E0BC6; Wed, 5 Apr 2017 14:25:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: dovgaluk@ispras.ru, rth@twiddle.net, pbonzini@redhat.com Date: Wed, 5 Apr 2017 14:24:57 +0100 Message-Id: <20170405132503.32125-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170405132503.32125-1-alex.bennee@linaro.org> References: <20170405132503.32125-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22e Subject: [Qemu-devel] [PATCH v2 06/12] cpus: check cpu->running in cpu_get_icount_raw() 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: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, bobby.prani@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The lifetime of current_cpu is now the lifetime of the vCPU thread. However get_icount_raw() can apply a fudge factor if called while code is running to take into account the current executed instruction count. To ensure this is always the case we also check cpu->running. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- cpus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 diff --git a/cpus.c b/cpus.c index 4e48b9c4ad..18b1746770 100644 --- a/cpus.c +++ b/cpus.c @@ -229,7 +229,7 @@ int64_t cpu_get_icount_raw(void) CPUState *cpu = current_cpu; icount = timers_state.qemu_icount; - if (cpu) { + if (cpu && cpu->running) { if (!cpu->can_do_io) { fprintf(stderr, "Bad icount read\n"); exit(1);