[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported |
Date: |
Fri, 21 Jan 2011 21:48:22 +0100 |
From: Jan Kiszka <address@hidden>
If the kernel does not support KVM_CAP_ASYNC_PF, it also does not know
about the related MSR. So skip it during state synchronization in that
case. Fixes annoying kernel warnings.
Signed-off-by: Jan Kiszka <address@hidden>
---
target-i386/kvm.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index b2c5ee0..8e8880a 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -63,6 +63,9 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
static bool has_msr_star;
static bool has_msr_hsave_pa;
+#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF)
+static bool has_msr_async_pf_en;
+#endif
static int lm_capable_kernel;
static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max)
@@ -164,6 +167,7 @@ static int get_para_features(CPUState *env)
features |= (1 << para_features[i].feature);
}
}
+ has_msr_async_pf_en = features & (1 << KVM_FEATURE_ASYNC_PF);
return features;
}
#endif
@@ -828,7 +832,10 @@ static int kvm_put_msrs(CPUState *env, int level)
env->system_time_msr);
kvm_msr_entry_set(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF)
- kvm_msr_entry_set(&msrs[n++], MSR_KVM_ASYNC_PF_EN,
env->async_pf_en_msr);
+ if (has_msr_async_pf_en) {
+ kvm_msr_entry_set(&msrs[n++], MSR_KVM_ASYNC_PF_EN,
+ env->async_pf_en_msr);
+ }
#endif
}
#ifdef KVM_CAP_MCE
@@ -1064,7 +1071,9 @@ static int kvm_get_msrs(CPUState *env)
msrs[n++].index = MSR_KVM_SYSTEM_TIME;
msrs[n++].index = MSR_KVM_WALL_CLOCK;
#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF)
- msrs[n++].index = MSR_KVM_ASYNC_PF_EN;
+ if (has_msr_async_pf_en) {
+ msrs[n++].index = MSR_KVM_ASYNC_PF_EN;
+ }
#endif
#ifdef KVM_CAP_MCE
--
1.7.1
- [Qemu-devel] [PATCH 00/18] [uq/master] Rebased patch queue, part I, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 15/18] kvm: Flush coalesced mmio buffer on IO window exits, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 16/18] kvm: Do not use qemu_fair_mutex, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported,
Jan Kiszka <=
- [Qemu-devel] [PATCH 17/18] kvm: x86: Implicitly clear nmi_injected/pending on reset, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 13/18] kvm: Consolidate must-have capability checks, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 06/18] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 05/18] kvm: x86: Align kvm_arch_put_registers code with comment, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 03/18] kvm: Improve reporting of fatal errors, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 10/18] kvm: x86: Reset paravirtual MSRs, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 01/18] kvm: x86: Swallow KVM_EXIT_SET_TPR, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 07/18] kvm: x86: Remove redundant mp_state initialization, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 04/18] x86: Optionally dump code bytes on cpu_dump_state, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 11/18] kvm: x86: Fix !CONFIG_KVM_PARA build, Jan Kiszka, 2011/01/21