From: Zhao Liu <zhao1.liu@xxxxxxxxx>
MSR_KVM_SYSTEM_TIME_NEW and MSR_KVM_WALL_CLOCK_NEW are bound to new
kvmclock (KVM_FEATURE_CLOCKSOURCE2).
Add the save/load support for these 2 MSRs.
Signed-off-by: Zhao Liu <zhao1.liu@xxxxxxxxx>
---
target/i386/cpu.h | 2 ++
target/i386/kvm/kvm.c | 16 ++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index b1b8d11cb0fe..b339f9ce454f 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1741,6 +1741,8 @@ typedef struct CPUArchState {
uint64_t system_time_msr;
uint64_t wall_clock_msr;
+ uint64_t system_time_new_msr;
+ uint64_t wall_clock_new_msr;
uint64_t steal_time_msr;
uint64_t async_pf_en_msr;
uint64_t async_pf_int_msr;
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 498580d60c3b..4a6bf0581859 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3323,6 +3323,12 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
}
+ if (env->features[FEAT_KVM] & CPUID_FEAT_KVM_CLOCK2) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME_NEW,
+ env->system_time_new_msr);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK_NEW,
+ env->wall_clock_new_msr);
+ }
if (env->features[FEAT_KVM] & CPUID_FEAT_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, env->async_pf_int_msr);
}
@@ -3790,6 +3796,10 @@ static int kvm_get_msrs(X86CPU *cpu)
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, 0);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, 0);
}
+ if (env->features[FEAT_KVM] & CPUID_FEAT_KVM_CLOCK2) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME_NEW, 0);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK_NEW, 0);
+ }
if (env->features[FEAT_KVM] & CPUID_FEAT_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, 0);
}
@@ -4029,6 +4039,12 @@ static int kvm_get_msrs(X86CPU *cpu)
case MSR_KVM_WALL_CLOCK:
env->wall_clock_msr = msrs[i].data;
break;
+ case MSR_KVM_SYSTEM_TIME_NEW:
+ env->system_time_new_msr = msrs[i].data;
+ break;
+ case MSR_KVM_WALL_CLOCK_NEW:
+ env->wall_clock_new_msr = msrs[i].data;
+ break;
case MSR_MCG_STATUS:
env->mcg_status = msrs[i].data;
break;
--
2.34.1
