Commit 73f624f4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: move MSR_IA32_POWER_CTL handling to common code 



Make it available to AMD hosts as well, just in case someone is trying
to use an Intel processor's CPUID setup.

Suggested-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4cb8b116

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ struct kvm_vcpu_arch { 
	u32 virtual_tsc_mult;

	u32 virtual_tsc_khz;

	s64 ia32_tsc_adjust_msr;

	u64 msr_ia32_power_ctl;

	u64 tsc_scaling_ratio;



	atomic_t nmi_queued;  /* unprocessed asynchronous NMIs */

arch/x86/kvm/vmx/vmx.c

+0 −6
Original line number Diff line number Diff line
@@ -1695,9 +1695,6 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_IA32_SYSENTER_ESP:

		msr_info->data = vmcs_readl(GUEST_SYSENTER_ESP);

		break;

	case MSR_IA32_POWER_CTL:

		msr_info->data = vmx->msr_ia32_power_ctl;

		break;

	case MSR_IA32_BNDCFGS:

		if (!kvm_mpx_supported() ||

		    (!msr_info->host_initiated &&
@@ -1828,9 +1825,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_IA32_SYSENTER_ESP:

		vmcs_writel(GUEST_SYSENTER_ESP, data);

		break;

	case MSR_IA32_POWER_CTL:

		vmx->msr_ia32_power_ctl = data;

		break;

	case MSR_IA32_BNDCFGS:

		if (!kvm_mpx_supported() ||

		    (!msr_info->host_initiated &&

arch/x86/kvm/vmx/vmx.h

+0 −2
Original line number Diff line number Diff line
@@ -260,8 +260,6 @@ struct vcpu_vmx { 


	unsigned long host_debugctlmsr;



	u64 msr_ia32_power_ctl;



	/*

	 * Only bits masked by msr_ia32_feature_control_valid_bits can be set in

	 * msr_ia32_feature_control. FEATURE_CONTROL_LOCKED is always included

arch/x86/kvm/x86.c

+6 −0
Original line number Diff line number Diff line
@@ -2563,6 +2563,9 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
			return 1;

		vcpu->arch.smbase = data;

		break;

	case MSR_IA32_POWER_CTL:

		vcpu->arch.msr_ia32_power_ctl = data;

		break;

	case MSR_IA32_TSC:

		kvm_write_tsc(vcpu, msr_info);

		break;
@@ -2822,6 +2825,9 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
			return 1;

		msr_info->data = vcpu->arch.arch_capabilities;

		break;

	case MSR_IA32_POWER_CTL:

		msr_info->data = vcpu->arch.msr_ia32_power_ctl;

		break;

	case MSR_IA32_TSC:

		msr_info->data = kvm_scale_tsc(vcpu, rdtsc()) + vcpu->arch.tsc_offset;

		break;