|
 |
9ae3a8 |
From 51db6795c68e1d00373d373c043543bbc6fb8f08 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 22 Oct 2014 09:46:33 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 2/6] Revert "kvmclock: Ensure proper env->tsc value for
|
|
|
9ae3a8 |
kvmclock_current_nsec calculation"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1413971197-4624-2-git-send-email-dgilbert@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 61789
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/5] Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation"
|
|
|
9ae3a8 |
Bugzilla: 1098602 1130428
|
|
|
9ae3a8 |
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This reverts commit da4fe791cecafbec05395041c52cb545308b1b61.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The equivalent upstream revert is Paolo's 108e4c3871e0d0cd185c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/kvm/clock.c | 4 ----
|
|
|
9ae3a8 |
1 file changed, 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
|
|
|
9ae3a8 |
index d52c2ea..1f2a26e 100644
|
|
|
9ae3a8 |
--- a/hw/i386/kvm/clock.c
|
|
|
9ae3a8 |
+++ b/hw/i386/kvm/clock.c
|
|
|
9ae3a8 |
@@ -17,7 +17,6 @@
|
|
|
9ae3a8 |
#include "qemu/host-utils.h"
|
|
|
9ae3a8 |
#include "sysemu/sysemu.h"
|
|
|
9ae3a8 |
#include "sysemu/kvm.h"
|
|
|
9ae3a8 |
-#include "sysemu/cpus.h"
|
|
|
9ae3a8 |
#include "hw/sysbus.h"
|
|
|
9ae3a8 |
#include "hw/kvm/clock.h"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -61,7 +60,6 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time));
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- assert(time.tsc_timestamp <= migration_tsc);
|
|
|
9ae3a8 |
delta = migration_tsc - time.tsc_timestamp;
|
|
|
9ae3a8 |
if (time.tsc_shift < 0) {
|
|
|
9ae3a8 |
delta >>= -time.tsc_shift;
|
|
|
9ae3a8 |
@@ -120,8 +118,6 @@ static void kvmclock_vm_state_change(void *opaque, int running,
|
|
|
9ae3a8 |
if (s->clock_valid) {
|
|
|
9ae3a8 |
return;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- cpu_synchronize_all_states();
|
|
|
9ae3a8 |
ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
|
|
|
9ae3a8 |
if (ret < 0) {
|
|
|
9ae3a8 |
fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|