|
@@ -2379,8 +2379,6 @@ static int get_msr_hyperv(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
|
|
|
|
|
|
int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
|
|
int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
|
|
{
|
|
{
|
|
- u64 data;
|
|
|
|
-
|
|
|
|
switch (msr_info->index) {
|
|
switch (msr_info->index) {
|
|
case MSR_IA32_PLATFORM_ID:
|
|
case MSR_IA32_PLATFORM_ID:
|
|
case MSR_IA32_EBL_CR_POWERON:
|
|
case MSR_IA32_EBL_CR_POWERON:
|
|
@@ -2453,7 +2451,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
|
|
/* TSC increment by tick */
|
|
/* TSC increment by tick */
|
|
msr_info->data = 1000ULL;
|
|
msr_info->data = 1000ULL;
|
|
/* CPU multiplier */
|
|
/* CPU multiplier */
|
|
- data |= (((uint64_t)4ULL) << 40);
|
|
|
|
|
|
+ msr_info->data |= (((uint64_t)4ULL) << 40);
|
|
break;
|
|
break;
|
|
case MSR_EFER:
|
|
case MSR_EFER:
|
|
msr_info->data = vcpu->arch.efer;
|
|
msr_info->data = vcpu->arch.efer;
|