Commit d7306163 authored Feb 06, 2008 by Paul Knowles Committed by Avi Kivity Mar 03, 2008

KVM: Fix kvm_arch_vcpu_ioctl_set_sregs so that set_cr0 works properly



Whilst working on getting a VM to initialize in to IA32e mode I found
this issue. set_cr0 relies on comparing the old cr0 to the new one to
work correctly.  Move the assignment below so the compare can work.

Signed-off-by: Paul Knowles <paul@transitive.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

parent 6b390b63

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2861,8 +2861,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
		kvm_x86_ops->decache_cr4_guest_bits(vcpu);

		mmu_reset_needed \|= vcpu->arch.cr0 != sregs->cr0;
		vcpu->arch.cr0 = sregs->cr0;
		kvm_x86_ops->set_cr0(vcpu, sregs->cr0);
		vcpu->arch.cr0 = sregs->cr0;

		mmu_reset_needed \|= vcpu->arch.cr4 != sregs->cr4;
		kvm_x86_ops->set_cr4(vcpu, sregs->cr4);