diff options
| author | Jim Somerville <Jim.Somerville@windriver.com> | 2017-09-29 12:00:19 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-10-02 14:39:51 +0200 |
| commit | 346b1215b1e9f7cc6d8fe9fb6f3c2778b890afb6 (patch) | |
| tree | 0c8938a3a8c433654f6c06ed75f219b3d55b4db9 /hw/i386/kvm | |
| parent | 11748ba72ea4fc03e975aa5f5d876b5b0902e356 (diff) | |
kvmclock: use the updated system_timer_msr
Fixes e2b6c17 (kvmclock: update system_time_msr address forcibly)
which makes a call to get the latest value of the address
stored in system_timer_msr, but then uses the old address anyway.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Message-Id: <59b67db0bd15a46ab47c3aa657c81a4c11f168ea.1506702472.git.Jim.Somerville@windriver.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386/kvm')
| -rw-r--r-- | hw/i386/kvm/clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 75ad1ba6f0..1707434db3 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -62,7 +62,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s) { CPUState *cpu = first_cpu; CPUX86State *env = cpu->env_ptr; - hwaddr kvmclock_struct_pa = env->system_time_msr & ~1ULL; + hwaddr kvmclock_struct_pa; uint64_t migration_tsc = env->tsc; struct pvclock_vcpu_time_info time; uint64_t delta; @@ -77,6 +77,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s) return 0; } + kvmclock_struct_pa = env->system_time_msr & ~1ULL; cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time)); assert(time.tsc_timestamp <= migration_tsc); |