diff options
| author | Michael Riepe <michael@mr511.de> | 2006-12-13 03:34:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:48 -0500 |
| commit | 3b99ab242145c99ec8781dc267ec100e7f23ef9d (patch) | |
| tree | b382de90fcd739843807a22c933f1efd798f4ac8 /drivers/kvm/vmx.c | |
| parent | 873a7c423bf8f12bff48a4b8963b32be568b4fcf (diff) | |
[PATCH] KVM: Don't touch the virtual apic vt registers on 32-bit
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/kvm/vmx.c')
| -rw-r--r-- | drivers/kvm/vmx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index d046296a9304..ea3bdbb0da9c 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c | |||
| @@ -1175,8 +1175,10 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu) | |||
| 1175 | VM_ENTRY_CONTROLS, 0); | 1175 | VM_ENTRY_CONTROLS, 0); |
| 1176 | vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0); /* 22.2.1 */ | 1176 | vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0); /* 22.2.1 */ |
| 1177 | 1177 | ||
| 1178 | #ifdef CONFIG_X86_64 | ||
| 1178 | vmcs_writel(VIRTUAL_APIC_PAGE_ADDR, 0); | 1179 | vmcs_writel(VIRTUAL_APIC_PAGE_ADDR, 0); |
| 1179 | vmcs_writel(TPR_THRESHOLD, 0); | 1180 | vmcs_writel(TPR_THRESHOLD, 0); |
| 1181 | #endif | ||
| 1180 | 1182 | ||
| 1181 | vmcs_writel(CR0_GUEST_HOST_MASK, KVM_GUEST_CR0_MASK); | 1183 | vmcs_writel(CR0_GUEST_HOST_MASK, KVM_GUEST_CR0_MASK); |
| 1182 | vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK); | 1184 | vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK); |