From patchwork Mon Apr 10 12:55:18 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: 97121 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1349525qgd; Mon, 10 Apr 2017 05:59:40 -0700 (PDT) X-Received: by 10.200.3.137 with SMTP id t9mr3014250qtg.244.1491829180465; Mon, 10 Apr 2017 05:59:40 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a17si8198355qtc.163.2017.04.10.05.59.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Apr 2017 05:59:40 -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]:34333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxYuw-0005hG-5A for patch@linaro.org; Mon, 10 Apr 2017 08:59:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxYqr-0002UD-SL for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxYqp-00037v-1B for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:25 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:33376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxYqo-00037B-QJ for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:22 -0400 Received: by mail-wr0-x22f.google.com with SMTP id l28so18757309wre.0 for ; Mon, 10 Apr 2017 05:55:22 -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=jrldZf0dU9y8/a6jqW3ZgGCF6m9HmctWAfhhQAdfQKE=; b=CB+jmp7Y80zUr6Fs8g/90/Yaa//AHYNoKw+4fEcVZT/7HGzq/7v6ckxuod/51Cjjxc wzWmdCK1BAZ6YRDeuAiUsW/1Skx5hTnpNyKasOQiI4wbLazfSzFuGN/ZdlDG9vTaG9iT cVqwnh9uzpPFJl7pUWlqdInsymiSviZVS9CFc= 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=jrldZf0dU9y8/a6jqW3ZgGCF6m9HmctWAfhhQAdfQKE=; b=GgXs1pbmVuUHI9hCPwF6d3Zpj/KPuRxbxVzcHrxKhgkLleAo+XB/9FcpS/q8FjW/dh 2zijR+x+WdaeBaYGuB9V7Wud810ufsI1DSpw/5WVbVLgtL5oEym0WB/9+ek8HtMz5Y8d F1JxCKDL0Nq4Kub7RKP//c4D++qLhd4DV08YinSDowY6xr/bcH/B0mTQ0EqZMmnDfXBI DKGFkak/Wy5l9fF9X6860tUGRbbdG4q3BgkQX+Mr8EHacHBqt58nz5KjRcpwueKaFL21 2b9ix6RAJtDRUbbDd5c5T6Xb8K1BoS9wGGMmCKqoJecyTd7wjxYaUFpfbHEHx577iH4q BtNA== X-Gm-Message-State: AFeK/H08p/iNF6WYTU2SH1MH4lHtkUDQMvmICs9E0awZTY+CCUo/7UU5hcFtuFFBbt28LyK1 X-Received: by 10.223.142.172 with SMTP id q41mr26520632wrb.25.1491828921623; Mon, 10 Apr 2017 05:55:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l14sm17363831wre.23.2017.04.10.05.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 05:55:19 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3DDE93E0FDF; Mon, 10 Apr 2017 13:55:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 10 Apr 2017 13:55:18 +0100 Message-Id: <20170410125524.21008-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170410125524.21008-1-alex.bennee@linaro.org> References: <20170410125524.21008-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::22f Subject: [Qemu-devel] [PULL 05/11] 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: Paolo Bonzini , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Crosthwaite 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 -- 2.11.0 diff --git a/cpus.c b/cpus.c index fc0ddc8793..7ec6473c02 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);