Skip to contentSkip to conversation

KVM: x86: Remove unnecessary brackets in kvm_arch_dev_ioctl()

PATCH Applied Xiaoyao Li 3 participants 4 messages Feb 29, 2020 – Mar 18, 2020

Subsystems (3)
lore
Share & tools
lore

Xiaoyao Li

author
#0 lore raw

PATCH v2 1/1 KVM: x86: Remove unnecessary brackets in kvm_arch_dev_ioctl()

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.

---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
index 5de200663f51..e49f3e735f77 100644
@@ -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;
Signature · 1 line
2.19.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 27 lines · Xiaoyao Li

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.

---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +1 -1
index 5de200663f51..e49f3e735f77 100644
@@ -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)))

arch/x86/kvm/x86.c long kvm_arch_dev_ioctl(struct file *filp, · line 3504

Quoted 10 lines
arch/x86/kvm/x86.c +1 -1
@@ -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;
Signature · 1 line
Vitaly
author
#2 lore raw
In reply to Xiaoyao Li

hi, Paolo?

Quoted 38 lines · Xiaoyao Li

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.

---
  arch/x86/kvm/x86.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
index 5de200663f51..e49f3e735f77 100644
@@ -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;
maintainer Applied
#3 lore raw
In reply to Xiaoyao Li
Quoted 28 lines · Xiaoyao Li

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.

---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +1 -1
index 5de200663f51..e49f3e735f77 100644
@@ -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)))

arch/x86/kvm/x86.c long kvm_arch_dev_ioctl(struct file *filp, · line 3504

Quoted 10 lines
arch/x86/kvm/x86.c +1 -1
@@ -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