From d0c1a4bbc1f05f9057122b3efcb66e349fdfb70a Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@redhat.com>
Date: Tue, 10 Nov 2009 13:52:00 -0200
Subject: [PATCH 1/2] 531701: properly save kvm system time msr registers

RH-Author: Glauber Costa <glommer@redhat.com>
Message-id: <1256806337-16149-2-git-send-email-glommer@redhat.com>
Patchwork-id: 3643
O-Subject: [PATCH 1/2] 531701: properly save kvm system time msr registers
Bugzilla: 531701
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
RH-Acked-by: Juan Quintela <quintela@redhat.com>
RH-Acked-by: Rik van Riel <riel@redhat.com>

Currently, the msrs involved in setting up pvclock are not saved over
migration and/or save/restore. This patch puts their value in special
fields in our CPUState, and deal with them using vmstate.

kvm also has to account for it, by including them in the msr list
for the ioctls.

RH-Upstream-status: qemu-kvm/master
RH-Bugzilla: BZ531701
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 qemu/qemu-kvm-x86.c        |   15 +++++++++++++--
 qemu/target-i386/cpu.h     |    5 ++++-
 qemu/target-i386/machine.c |    9 ++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/qemu-kvm-x86.c        |   15 +++++++++++++--
 qemu/target-i386/cpu.h     |    5 ++++-
 qemu/target-i386/machine.c |    9 ++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/qemu/qemu-kvm-x86.c b/qemu/qemu-kvm-x86.c
index e95c489..de709ae 100644
--- a/qemu/qemu-kvm-x86.c
+++ b/qemu/qemu-kvm-x86.c
@@ -103,6 +103,12 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
         case MSR_VM_HSAVE_PA:
             env->vm_hsave     = entry->data;
             break;
+        case MSR_KVM_SYSTEM_TIME:
+            env->system_time_msr = entry->data;
+            break;
+        case MSR_KVM_WALL_CLOCK:
+            env->wall_clock_msr = entry->data;
+            break;
         default:
             printf("Warning unknown msr index 0x%x\n", entry->index);
             return 1;
@@ -111,9 +117,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
 }
 
 #ifdef TARGET_X86_64
-#define MSR_COUNT 10
+#define MSR_COUNT 12
 #else
-#define MSR_COUNT 6
+#define MSR_COUNT 8
 #endif
 
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -270,6 +276,8 @@ void kvm_arch_load_regs(CPUState *env)
         set_msr_entry(&msrs[n++], MSR_LSTAR  ,           env->lstar);
     }
 #endif
+    set_msr_entry(&msrs[n++], MSR_KVM_SYSTEM_TIME,  env->system_time_msr);
+    set_msr_entry(&msrs[n++], MSR_KVM_WALL_CLOCK,  env->wall_clock_msr);
 
     rc = kvm_set_msrs(kvm_context, env->cpu_index, msrs, n);
     if (rc == -1)
@@ -446,6 +454,9 @@ void kvm_arch_save_regs(CPUState *env)
         msrs[n++].index = MSR_LSTAR;
     }
 #endif
+    msrs[n++].index = MSR_KVM_SYSTEM_TIME;
+    msrs[n++].index = MSR_KVM_WALL_CLOCK;
+
     rc = kvm_get_msrs(kvm_context, env->cpu_index, msrs, n);
     if (rc == -1) {
         perror("kvm_get_msrs FAILED");
diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h
index 400a7e5..b4c0bec 100644
--- a/qemu/target-i386/cpu.h
+++ b/qemu/target-i386/cpu.h
@@ -596,6 +596,9 @@ typedef struct CPUX86State {
     target_ulong fmask;
     target_ulong kernelgsbase;
 #endif
+    uint64_t system_time_msr;
+    uint64_t wall_clock_msr;
+
 
     uint64_t tsc;
 
@@ -806,7 +809,7 @@ static inline int cpu_get_time_fast(void)
 #define cpu_signal_handler cpu_x86_signal_handler
 #define cpu_list x86_cpu_list
 
-#define CPU_SAVE_VERSION 7
+#define CPU_SAVE_VERSION 8
 
 /* MMU modes definitions */
 #define MMU_MODE0_SUFFIX _kernel
diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index 4e90c5a..7949bea 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -149,6 +149,8 @@ void cpu_save(QEMUFile *f, void *opaque)
         qemu_put_be64s(f, &env->tsc);
         qemu_put_be32s(f, &env->mp_state);
     }
+    qemu_put_be64s(f, &env->system_time_msr);
+    qemu_put_be64s(f, &env->wall_clock_msr);
 }
 
 #ifdef USE_X86LDOUBLE
@@ -184,7 +186,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
     int32_t a20_mask;
 
     if (version_id != 3 && version_id != 4 && version_id != 5
-        && version_id != 6 && version_id != 7)
+        && version_id != 6 && version_id != 7 && version_id != 8)
         return -EINVAL;
     for(i = 0; i < CPU_NB_REGS; i++)
         qemu_get_betls(f, &env->regs[i]);
@@ -336,5 +338,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
             kvm_load_mpstate(env);
         }
     }
+
+    if (version_id >= 8) {
+        qemu_get_be64s(f, &env->system_time_msr);
+        qemu_get_be64s(f, &env->wall_clock_msr);
+    }
     return 0;
 }
-- 
1.6.3.rc4.29.g8146