diff options
author | Emilio G. Cota <cota@braap.org> | 2018-09-10 19:27:49 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-10-02 18:47:55 +0200 |
commit | 38adcb6e4197b5277dbb5ad0036a804b30b25bc6 (patch) | |
tree | 6b890c49dcc89e9b82f7f32c312f6e88620162be /cpus.c | |
parent | 9b4e6f496601d3cd35fd8d09c9e2103999fd5c33 (diff) | |
download | qemu-38adcb6e4197b5277dbb5ad0036a804b30b25bc6.zip qemu-38adcb6e4197b5277dbb5ad0036a804b30b25bc6.tar.gz qemu-38adcb6e4197b5277dbb5ad0036a804b30b25bc6.tar.bz2 |
cpus: access .qemu_icount with atomic64
Signed-off-by: Emilio G. Cota <cota@braap.org>
Message-Id: <20180910232752.31565-10-cota@braap.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'cpus.c')
-rw-r--r-- | cpus.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -250,8 +250,8 @@ static void cpu_update_icount_locked(CPUState *cpu) int64_t executed = cpu_get_icount_executed(cpu); cpu->icount_budget -= executed; - atomic_set__nocheck(&timers_state.qemu_icount, - timers_state.qemu_icount + executed); + atomic_set_i64(&timers_state.qemu_icount, + timers_state.qemu_icount + executed); } /* @@ -280,8 +280,8 @@ static int64_t cpu_get_icount_raw_locked(void) /* Take into account what has run */ cpu_update_icount_locked(cpu); } - /* The read is protected by the seqlock, so __nocheck is okay. */ - return atomic_read__nocheck(&timers_state.qemu_icount); + /* The read is protected by the seqlock, but needs atomic64 to avoid UB */ + return atomic_read_i64(&timers_state.qemu_icount); } static int64_t cpu_get_icount_locked(void) |