[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/31] kvm: x86: Fix !CONFIG_KVM_PARA build
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 24/31] kvm: x86: Fix !CONFIG_KVM_PARA build |
Date: |
Mon, 24 Jan 2011 07:02:33 -0200 |
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>
Signed-off-by: Marcelo Tosatti <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.2.3
- [Qemu-devel] [PATCH 00/31] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 19/31] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 22/31] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 24/31] kvm: x86: Fix !CONFIG_KVM_PARA build,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 11/31] kvm: x86: Prevent sign extension of DR7 in guest debugging mode, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 30/31] kvm: x86: Implicitly clear nmi_injected/pending on reset, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 31/31] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 03/31] Clean up cpu_inject_x86_mce(), Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 15/31] kvm: Stop on all fatal exit reasons, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 17/31] x86: Optionally dump code bytes on cpu_dump_state, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 02/31] kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension(), Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 28/31] kvm: Flush coalesced mmio buffer on IO window exits, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 05/31] Add function for checking mca broadcast of CPU, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 04/31] Add "broadcast" option for mce command, Marcelo Tosatti, 2011/01/24