2018-08-16 09:24:18

by Yi Wang

Subject: [PATCH] x86/kvm/vmx: Fix coding style in vmx_setup_l1d_flush()

Substitute spaces with tab. No functional changes.

Signed-off-by: Yi Wang <[email protected]>
Reviewed-by: Jiang Biao <[email protected]>
---
arch/x86/kvm/vmx.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 46b428c0..ef712b2 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -218,15 +218,15 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)
return 0;
}

- if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) {
- u64 msr;
-
- rdmsrl(MSR_IA32_ARCH_CAPABILITIES, msr);
- if (msr & ARCH_CAP_SKIP_VMENTRY_L1DFLUSH) {
- l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NOT_REQUIRED;
- return 0;
- }
- }
+ if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) {
+ u64 msr;
+
+ rdmsrl(MSR_IA32_ARCH_CAPABILITIES, msr);
+ if (msr & ARCH_CAP_SKIP_VMENTRY_L1DFLUSH) {
+ l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NOT_REQUIRED;
+ return 0;
+ }
+ }

/* If set to auto use the default l1tf mitigation method */
if (l1tf == VMENTER_L1D_FLUSH_AUTO) {
--
1.8.3.1

2018-08-20 13:05:34

by Paolo Bonzini

Subject: Re: [PATCH] x86/kvm/vmx: Fix coding style in vmx_setup_l1d_flush()

On 16/08/2018 07:42, Yi Wang wrote:
> Substitute spaces with tab. No functional changes.
>
> Signed-off-by: Yi Wang <[email protected]>
> Reviewed-by: Jiang Biao <[email protected]>
> ---
> arch/x86/kvm/vmx.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 46b428c0..ef712b2 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -218,15 +218,15 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)
> return 0;
> }
>
> - if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) {
> - u64 msr;
> -
> - rdmsrl(MSR_IA32_ARCH_CAPABILITIES, msr);
> - if (msr & ARCH_CAP_SKIP_VMENTRY_L1DFLUSH) {
> - l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NOT_REQUIRED;
> - return 0;
> - }
> - }
> + if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) {
> + u64 msr;
> +
> + rdmsrl(MSR_IA32_ARCH_CAPABILITIES, msr);
> + if (msr & ARCH_CAP_SKIP_VMENTRY_L1DFLUSH) {
> + l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NOT_REQUIRED;
> + return 0;
> + }
> + }
>
> /* If set to auto use the default l1tf mitigation method */
> if (l1tf == VMENTER_L1D_FLUSH_AUTO) {
>

Queued, thanks.

Paolo