Re: [PATCH] KVM: vmx: unify adjacent #ifdefs

[David Hildenbrand]

On 04.04.2018 18:59, Paolo Bonzini wrote:
> vmx_save_host_state has multiple ifdefs for CONFIG_X86_64 that have
> no other code between them.  Simplify by reducing them to a single
> conditional.
> 
> Signed-off-by: Paolo Bonzini 
> ---
>  arch/x86/kvm/vmx.c | 10 +++---
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 939c8724feb4..a1572461786e 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -2392,20 +2392,16 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
>  #ifdef CONFIG_X86_64
>   savesegment(ds, vmx->host_state.ds_sel);
>   savesegment(es, vmx->host_state.es_sel);
> -#endif
>  
> -#ifdef CONFIG_X86_64
>   vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
>   vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
> -#else
> - vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
> - vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
> -#endif
>  
> -#ifdef CONFIG_X86_64
>   vmx->msr_host_kernel_gs_base = current->thread.gsbase;
>   if (is_long_mode(>vcpu))
>   wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
> +#else
> + vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
> + vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
>  #endif
>   if (boot_cpu_has(X86_FEATURE_MPX))
>   rdmsrl(MSR_IA32_BNDCFGS, vmx->host_state.msr_host_bndcfgs);
> 

Much better indeed :)

Reviewed-by: David Hildenbrand 

-- 

Thanks,

David / dhildenb

Re: [PATCH] KVM: vmx: unify adjacent #ifdefs

[David Hildenbrand]

On 04.04.2018 18:59, Paolo Bonzini wrote:
> vmx_save_host_state has multiple ifdefs for CONFIG_X86_64 that have
> no other code between them.  Simplify by reducing them to a single
> conditional.
> 
> Signed-off-by: Paolo Bonzini 
> ---
>  arch/x86/kvm/vmx.c | 10 +++---
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 939c8724feb4..a1572461786e 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -2392,20 +2392,16 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
>  #ifdef CONFIG_X86_64
>   savesegment(ds, vmx->host_state.ds_sel);
>   savesegment(es, vmx->host_state.es_sel);
> -#endif
>  
> -#ifdef CONFIG_X86_64
>   vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
>   vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
> -#else
> - vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
> - vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
> -#endif
>  
> -#ifdef CONFIG_X86_64
>   vmx->msr_host_kernel_gs_base = current->thread.gsbase;
>   if (is_long_mode(>vcpu))
>   wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
> +#else
> + vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
> + vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
>  #endif
>   if (boot_cpu_has(X86_FEATURE_MPX))
>   rdmsrl(MSR_IA32_BNDCFGS, vmx->host_state.msr_host_bndcfgs);
> 

Much better indeed :)

Reviewed-by: David Hildenbrand 

-- 

Thanks,

David / dhildenb

Re: [PATCH] KVM: vmx: unify adjacent #ifdefs

[Krish Sadhukhan]

On 04/04/2018 09:59 AM, Paolo Bonzini wrote:

vmx_save_host_state has multiple ifdefs for CONFIG_X86_64 that have
no other code between them.  Simplify by reducing them to a single
conditional.

Signed-off-by: Paolo Bonzini 
---
  arch/x86/kvm/vmx.c | 10 +++---
  1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 939c8724feb4..a1572461786e 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2392,20 +2392,16 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
  #ifdef CONFIG_X86_64
savesegment(ds, vmx->host_state.ds_sel);
savesegment(es, vmx->host_state.es_sel);
-#endif
  
-#ifdef CONFIG_X86_64

vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
-#else
-   vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
-   vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
-#endif
  
-#ifdef CONFIG_X86_64

vmx->msr_host_kernel_gs_base = current->thread.gsbase;
if (is_long_mode(>vcpu))
wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
+#else
+   vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
+   vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
  #endif
if (boot_cpu_has(X86_FEATURE_MPX))
rdmsrl(MSR_IA32_BNDCFGS, vmx->host_state.msr_host_bndcfgs);

Reviewed-by: Krish Sadhukhan 

Re: [PATCH] KVM: vmx: unify adjacent #ifdefs

[Krish Sadhukhan]

On 04/04/2018 09:59 AM, Paolo Bonzini wrote:

vmx_save_host_state has multiple ifdefs for CONFIG_X86_64 that have
no other code between them.  Simplify by reducing them to a single
conditional.

Signed-off-by: Paolo Bonzini 
---
  arch/x86/kvm/vmx.c | 10 +++---
  1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 939c8724feb4..a1572461786e 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2392,20 +2392,16 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
  #ifdef CONFIG_X86_64
savesegment(ds, vmx->host_state.ds_sel);
savesegment(es, vmx->host_state.es_sel);
-#endif
  
-#ifdef CONFIG_X86_64

vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
-#else
-   vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
-   vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
-#endif
  
-#ifdef CONFIG_X86_64

vmx->msr_host_kernel_gs_base = current->thread.gsbase;
if (is_long_mode(>vcpu))
wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
+#else
+   vmcs_writel(HOST_FS_BASE, segment_base(vmx->host_state.fs_sel));
+   vmcs_writel(HOST_GS_BASE, segment_base(vmx->host_state.gs_sel));
  #endif
if (boot_cpu_has(X86_FEATURE_MPX))
rdmsrl(MSR_IA32_BNDCFGS, vmx->host_state.msr_host_bndcfgs);

Reviewed-by: Krish Sadhukhan