[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/18] kvm: x86: Fix !CONFIG_KVM_PARA build
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 11/18] kvm: x86: Fix !CONFIG_KVM_PARA build |
Date: |
Fri, 21 Jan 2011 21:48:15 +0100 |
From: Jan Kiszka <address@hidden>
If we lack kvm_para.h, MSR_KVM_ASYNC_PF_EN is not defined. The change in
kvm_arch_init_vcpu is just for consistency reasons.
Signed-off-by: Jan Kiszka <address@hidden>
---
target-i386/kvm.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 825af42..feaf33d 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -319,7 +319,7 @@ int kvm_arch_init_vcpu(CPUState *env)
uint32_t limit, i, j, cpuid_i;
uint32_t unused;
struct kvm_cpuid_entry2 *c;
-#ifdef KVM_CPUID_SIGNATURE
+#ifdef CONFIG_KVM_PARA
uint32_t signature[3];
#endif
@@ -855,7 +855,7 @@ static int kvm_put_msrs(CPUState *env, int level)
kvm_msr_entry_set(&msrs[n++], MSR_KVM_SYSTEM_TIME,
env->system_time_msr);
kvm_msr_entry_set(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
-#ifdef KVM_CAP_ASYNC_PF
+#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);
#endif
}
@@ -1091,7 +1091,7 @@ static int kvm_get_msrs(CPUState *env)
#endif
msrs[n++].index = MSR_KVM_SYSTEM_TIME;
msrs[n++].index = MSR_KVM_WALL_CLOCK;
-#ifdef KVM_CAP_ASYNC_PF
+#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF)
msrs[n++].index = MSR_KVM_ASYNC_PF_EN;
#endif
@@ -1167,7 +1167,7 @@ static int kvm_get_msrs(CPUState *env)
}
#endif
break;
-#ifdef KVM_CAP_ASYNC_PF
+#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF)
case MSR_KVM_ASYNC_PF_EN:
env->async_pf_en_msr = msrs[i].data;
break;
--
1.7.1
- [Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, (continued)
- [Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, Jan Kiszka, 2011/01/21
- [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 <=
- [Qemu-devel] [PATCH 02/18] kvm: Stop on all fatal exit reasons, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 12/18] kvm: Drop smp_cpus argument from init functions, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 14/18] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 08/18] kvm: x86: Fix xcr0 reset mismerge, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 09/18] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Jan Kiszka, 2011/01/21