| Message ID | 20200229025212.156388-1-xiaoyao.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] KVM: x86: Remove unnecessary brackets in kvm_arch_dev_ioctl() | expand |
Xiaoyao Li <xiaoyao.li@intel.com> writes: > In kvm_arch_dev_ioctl(), the brackets of case KVM_X86_GET_MCE_CAP_SUPPORTED > accidently encapsulates case KVM_GET_MSR_FEATURE_INDEX_LIST and case > KVM_GET_MSRS. It doesn't affect functionality but it's misleading. > > Remove unnecessary brackets and opportunistically add a "break" in the > default path. > > Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com> > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > arch/x86/kvm/x86.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 5de200663f51..e49f3e735f77 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -3464,7 +3464,7 @@ long kvm_arch_dev_ioctl(struct file *filp, > r = 0; > break; > } > - case KVM_X86_GET_MCE_CAP_SUPPORTED: { > + case KVM_X86_GET_MCE_CAP_SUPPORTED: > r = -EFAULT; > if (copy_to_user(argp, &kvm_mce_cap_supported, > sizeof(kvm_mce_cap_supported))) > @@ -3496,9 +3496,9 @@ long kvm_arch_dev_ioctl(struct file *filp, > case KVM_GET_MSRS: > r = msr_io(NULL, argp, do_get_msr_feature, 1); > break; > - } > default: > r = -EINVAL; > + break; > } > out: > return r; Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
hi, Paolo? On 2/29/2020 10:52 AM, Xiaoyao Li wrote: > In kvm_arch_dev_ioctl(), the brackets of case KVM_X86_GET_MCE_CAP_SUPPORTED > accidently encapsulates case KVM_GET_MSR_FEATURE_INDEX_LIST and case > KVM_GET_MSRS. It doesn't affect functionality but it's misleading. > > Remove unnecessary brackets and opportunistically add a "break" in the > default path. > > Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com> > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > arch/x86/kvm/x86.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 5de200663f51..e49f3e735f77 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -3464,7 +3464,7 @@ long kvm_arch_dev_ioctl(struct file *filp, > r = 0; > break; > } > - case KVM_X86_GET_MCE_CAP_SUPPORTED: { > + case KVM_X86_GET_MCE_CAP_SUPPORTED: > r = -EFAULT; > if (copy_to_user(argp, &kvm_mce_cap_supported, > sizeof(kvm_mce_cap_supported))) > @@ -3496,9 +3496,9 @@ long kvm_arch_dev_ioctl(struct file *filp, > case KVM_GET_MSRS: > r = msr_io(NULL, argp, do_get_msr_feature, 1); > break; > - } > default: > r = -EINVAL; > + break; > } > out: > return r; >
On 29/02/20 03:52, Xiaoyao Li wrote: > In kvm_arch_dev_ioctl(), the brackets of case KVM_X86_GET_MCE_CAP_SUPPORTED > accidently encapsulates case KVM_GET_MSR_FEATURE_INDEX_LIST and case > KVM_GET_MSRS. It doesn't affect functionality but it's misleading. > > Remove unnecessary brackets and opportunistically add a "break" in the > default path. > > Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com> > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > arch/x86/kvm/x86.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 5de200663f51..e49f3e735f77 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -3464,7 +3464,7 @@ long kvm_arch_dev_ioctl(struct file *filp, > r = 0; > break; > } > - case KVM_X86_GET_MCE_CAP_SUPPORTED: { > + case KVM_X86_GET_MCE_CAP_SUPPORTED: > r = -EFAULT; > if (copy_to_user(argp, &kvm_mce_cap_supported, > sizeof(kvm_mce_cap_supported))) > @@ -3496,9 +3496,9 @@ long kvm_arch_dev_ioctl(struct file *filp, > case KVM_GET_MSRS: > r = msr_io(NULL, argp, do_get_msr_feature, 1); > break; > - } > default: > r = -EINVAL; > + break; > } > out: > return r; > Queued as "KVM: x86: Code style cleanup in kvm_arch_dev_ioctl()", thanks. Paolo
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5de200663f51..e49f3e735f77 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3464,7 +3464,7 @@ long kvm_arch_dev_ioctl(struct file *filp, r = 0; break; } - case KVM_X86_GET_MCE_CAP_SUPPORTED: { + case KVM_X86_GET_MCE_CAP_SUPPORTED: r = -EFAULT; if (copy_to_user(argp, &kvm_mce_cap_supported, sizeof(kvm_mce_cap_supported))) @@ -3496,9 +3496,9 @@ long kvm_arch_dev_ioctl(struct file *filp, case KVM_GET_MSRS: r = msr_io(NULL, argp, do_get_msr_feature, 1); break; - } default: r = -EINVAL; + break; } out: return r;
In kvm_arch_dev_ioctl(), the brackets of case KVM_X86_GET_MCE_CAP_SUPPORTED accidently encapsulates case KVM_GET_MSR_FEATURE_INDEX_LIST and case KVM_GET_MSRS. It doesn't affect functionality but it's misleading. Remove unnecessary brackets and opportunistically add a "break" in the default path. Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> --- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)