From 44069a9d017743719532ec93fdbbcaacd92c1901 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 22 Apr 2010 18:46:31 +0400 Subject: [PATCH] kvm: Don't touch 64 bit specific MSR registers on 32 bit Signed-off-by: Cyrill Gorcunov Signed-off-by: Pekka Enberg --- kvm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kvm.c b/kvm.c index 9a27170..0be22c1 100644 --- a/kvm.c +++ b/kvm.c @@ -421,11 +421,13 @@ static void kvm__setup_msrs(struct kvm *self) self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_SYSENTER_CS, 0x0); self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_SYSENTER_ESP, 0x0); self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_SYSENTER_EIP, 0x0); +#ifdef __x86_64__ self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_STAR, 0x0); self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_CSTAR, 0x0); self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_KERNEL_GS_BASE, 0x0); self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_FMASK, 0x0); self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_LSTAR, 0x0); +#endif self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_TIME_STAMP_COUNTER, 0x0); self->msrs->nmsrs = ndx;