From patchwork Fri Apr 7 15:42:15 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: 97038 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp341879qgd; Fri, 7 Apr 2017 08:48:14 -0700 (PDT) X-Received: by 10.200.56.162 with SMTP id f31mr39711899qtc.152.1491580094227; Fri, 07 Apr 2017 08:48:14 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x2si5130350qtx.200.2017.04.07.08.48.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Apr 2017 08:48:14 -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]:51513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwW7R-0006cw-PC for patch@linaro.org; Fri, 07 Apr 2017 11:48:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwW1q-0002Op-HE for qemu-devel@nongnu.org; Fri, 07 Apr 2017 11:42:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwW1p-0007Vo-G5 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 11:42:26 -0400 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:34277) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwW1p-0007VG-Aj for qemu-devel@nongnu.org; Fri, 07 Apr 2017 11:42:25 -0400 Received: by mail-wr0-x22d.google.com with SMTP id t20so112057569wra.1 for ; Fri, 07 Apr 2017 08:42:25 -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=eU66FEMb+9IUqNZp+f3VYPDR5yFr52wrPK4ICpZMkLloaqP1s63Dxas1R8S417RScc u822xZ2hEAxtl4p2byCBp9x+062s9GXftNgVe6XwwSjBfOs1uRYoS3m1yLED3sTxCBtS Y5wiAF/BhbZ+Hvta2tHv1GlATV8Rzu+GUGBN8= 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=NyxXoZdjkADS5rAOI8L2xZhtQHLhb//FqxQl6okMAA2EjqYebLe4biOXQhT+PbFPgv 3LPIdMCCDJ3NMJaIvBl0Gzn9YdQkXnMQ7AEODCr0i5pK+eNmErcESvtDb5fl6rO5KyhU vQB8RhSpSKFoAZ8tduvUtTvFYchwnbZBxobwhAs5DVVV91BKXXS/tStIIF5lqXXakM4l 7bRbEOyiKXIDktTb/jDLiUm88roWF4i7Z+HKYwkBWBHPqfAc4L9xiqEV7T4Sy67XWhBj KCMN6PVAy7HiQCniFXM1d48PBk4CNkSzHc9PdRo162CN9eoWAlBkZzi4W6xH7wHaKc8F UV7A== X-Gm-Message-State: AFeK/H0yMZK+SU29p58krQVxErp9es9Jy+DIxjj+T3ILSpp9ManAQZXD8l86AUYE2H2JvIMk X-Received: by 10.223.151.16 with SMTP id r16mr14817363wrb.189.1491579744126; Fri, 07 Apr 2017 08:42:24 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g10sm6435500wrb.56.2017.04.07.08.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Apr 2017 08:42:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 782E73E1104; Fri, 7 Apr 2017 16:42:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: dovgaluk@ispras.ru, rth@twiddle.net, pbonzini@redhat.com Date: Fri, 7 Apr 2017 16:42:15 +0100 Message-Id: <20170407154221.26918-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170407154221.26918-1-alex.bennee@linaro.org> References: <20170407154221.26918-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::22d Subject: [Qemu-devel] [PATCH v3 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);