Commit eff708bc authored May 06, 2007 by Avi Kivity

KVM: VMX: Only reload guest msrs if they are already loaded



If we set an msr via an ioctl() instead of by handling a guest exit, we
have the host state loaded, so reloading the msrs would clobber host
state instead of guest state.

This fixes a host oops (and loss of a cpu) on a guest reboot.

Signed-off-by: Avi Kivity <avi@qumranet.com>

parent 47ad8e68

drivers/kvm/vmx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -600,6 +600,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
		msr = find_msr_entry(vcpu, msr_index);
		if (msr)
		msr->data = data;
		if (vcpu->vmx_host_state.loaded)
		load_msrs(vcpu->guest_msrs, NR_BAD_MSRS);
		break;
		#endif