[PATCH] KVM: x86: remove data variable from kvm_get_msr_common

[Nicolas Iooss]

Commit 609e36d372ad ("KVM: x86: pass host_initiated to functions that
read MSRs") modified kvm_get_msr_common function to use msr_info->data
instead of data but missed one occurrence.  Replace it and remove the
unused local variable.

Fixes: 609e36d372ad ("KVM: x86: pass host_initiated to functions that
read MSRs")
Signed-off-by: Nicolas Iooss 
---
 arch/x86/kvm/x86.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ac165c2fb8e5..bbaf44e8f0d3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -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)
 {
-   u64 data;
-
switch (msr_info->index) {
case MSR_IA32_PLATFORM_ID:
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 */
msr_info->data = 1000ULL;
/* CPU multiplier */
-   data |= (((uint64_t)4ULL) << 40);
+   msr_info->data |= (((uint64_t)4ULL) << 40);
break;
case MSR_EFER:
msr_info->data = vcpu->arch.efer;
-- 
2.4.4

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] KVM: x86: remove data variable from kvm_get_msr_common

[Paolo Bonzini]

On 29/06/2015 12:39, Nicolas Iooss wrote:
> Commit 609e36d372ad ("KVM: x86: pass host_initiated to functions that
> read MSRs") modified kvm_get_msr_common function to use msr_info->data
> instead of data but missed one occurrence.  Replace it and remove the
> unused local variable.
> 
> Fixes: 609e36d372ad ("KVM: x86: pass host_initiated to functions that
> read MSRs")
> Signed-off-by: Nicolas Iooss 
> ---
>  arch/x86/kvm/x86.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index ac165c2fb8e5..bbaf44e8f0d3 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -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)
>  {
> - u64 data;
> -
>   switch (msr_info->index) {
>   case MSR_IA32_PLATFORM_ID:
>   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 */
>   msr_info->data = 1000ULL;
>   /* CPU multiplier */
> - data |= (((uint64_t)4ULL) << 40);
> + msr_info->data |= (((uint64_t)4ULL) << 40);
>   break;
>   case MSR_EFER:
>   msr_info->data = vcpu->arch.efer;
> 

Applied, thanks.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html