[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] cpus: check cpu->running in cpu_get_icount_raw
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 05/11] cpus: check cpu->running in cpu_get_icount_raw() |
Date: |
Mon, 10 Apr 2017 13:55:18 +0100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
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);
--
2.11.0
- [Qemu-devel] [PULL 00/11] Final icount and misc MTTCG fixes for 2.9, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 04/11] cpus: remove icount handling from qemu_tcg_cpu_thread_fn, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 02/11] cpus: fix wrong define name, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 05/11] cpus: check cpu->running in cpu_get_icount_raw(),
Alex Bennée <=
- [Qemu-devel] [PULL 06/11] cpus: move icount preparation out of tcg_exec_cpu, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 03/11] target/i386/misc_helper: wrap BQL around another IRQ generator, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 01/11] scripts/qemugdb/mtree.py: fix up mtree dump, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 10/11] cpus: call cpu_update_icount on read, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 08/11] cpus: introduce cpu_update_icount helper, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 11/11] replay: assert time only goes forward, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 09/11] cpu-exec: update icount after each TB_EXIT, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 07/11] cpus: don't credit executed instructions before they have run, Alex Bennée, 2017/04/10
- Re: [Qemu-devel] [PULL 00/11] Final icount and misc MTTCG fixes for 2.9, Peter Maydell, 2017/04/10