Re: [PATCH] arch/x86/kvm/x86.c: remove a superfluous test for !X86_64

[Paolo Bonzini <pbonzini@redhat.com>]

Il 27/04/2014 17:32, Toralf Förster ha scritto:
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 8b8fc0b..a6ca7e0 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -5680,15 +5680,17 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
>  	kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);
>  	longmode = is_long_mode(vcpu) && cs_l == 1;
>
> +#ifdef CONFIG_X86_64
>  	if (!longmode) {
> +#endif

This is ugly...

>  		param = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDX) << 32) |
>  			(kvm_register_read(vcpu, VCPU_REGS_RAX) & 0xffffffff);
>  		ingpa = ((u64)kvm_register_read(vcpu, VCPU_REGS_RBX) << 32) |
>  			(kvm_register_read(vcpu, VCPU_REGS_RCX) & 0xffffffff);
>  		outgpa = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDI) << 32) |
>  			(kvm_register_read(vcpu, VCPU_REGS_RSI) & 0xffffffff);
> -	}
>  #ifdef CONFIG_X86_64

... can you just remove this #ifdef instead?  It will be dead code, but 
the compiler will detect it as such and remove it.

Paolo

> +	}
>  	else {
>  		param = kvm_register_read(vcpu, VCPU_REGS_RCX);
>  		ingpa = kvm_register_read(vcpu, VCPU_REGS_RDX);