kvm: remove one useless check extension

PATCH Applied Tiejun Chen 3 participants 3 messages May 4, 2015 – May 5, 2015

Subsystems (3)

Arm (32-bit) KVM KVM arm64

lore

Share & tools

lore

Tiejun Chen

author

2015-05-04 02:51 UTC #0 lore raw

PATCH 1/1 kvm: remove one useless check extension

We already check KVM_CAP_IRQFD in generic once enable CONFIG_HAVE_KVM_IRQFD,

kvm_vm_ioctl_check_extension_generic()
|
+ switch (arg) {
+ ...
+ #ifdef CONFIG_HAVE_KVM_IRQFD
+ case KVM_CAP_IRQFD:
+ #endif
+ ...
+ return 1;
+ ...
+ }
|
+ kvm_vm_ioctl_check_extension()

So its not necessary to check this in arch again, and also fix one typo, s/emlation/emulation.

Signed-off-by Tiejun Chen <[email protected]>

---
 arch/arm/kvm/arm.c       | 1 -
 include/uapi/linux/kvm.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

arch/arm/kvm/arm.c +0 -1

index d9631ec..483b5d1 100644
@@ -171,7 +171,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	int r;
 	switch (ext) {
 	case KVM_CAP_IRQCHIP:
-	case KVM_CAP_IRQFD:
 	case KVM_CAP_IOEVENTFD:
 	case KVM_CAP_DEVICE_CTRL:
 	case KVM_CAP_USER_MEMORY:

include/uapi/linux/kvm.h +1 -1

index 4b60056..2fa7302 100644
@@ -894,7 +894,7 @@ struct kvm_xen_hvm_config {
  *
  * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
  * the irqfd to operate in resampling mode for level triggered interrupt
- * emlation.  See Documentation/virtual/kvm/api.txt.
+ * emulation.  See Documentation/virtual/kvm/api.txt.
  */
 #define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)

Signature · 1 line

1.9.1

Paolo Bonzini

maintainer Acked-by on v1 1/1

2015-05-04 09:24 UTC #1 lore raw

Quoted 43 lines · Tiejun Chen

We already check KVM_CAP_IRQFD in generic once enable CONFIG_HAVE_KVM_IRQFD,
kvm_vm_ioctl_check_extension_generic()
|
+ switch (arg) {
+ ...
+ #ifdef CONFIG_HAVE_KVM_IRQFD
+ case KVM_CAP_IRQFD:
+ #endif
+ ...
+ return 1;
+ ...
+ }
|
+ kvm_vm_ioctl_check_extension()
So its not necessary to check this in arch again, and also fix one typo, s/emlation/emulation.
Signed-off-by Tiejun Chen <[email protected]>
---
 arch/arm/kvm/arm.c       | 1 -
 include/uapi/linux/kvm.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/kvm/arm.c +0 -1
index d9631ec..483b5d1 100644
@@ -171,7 +171,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	int r;
 	switch (ext) {
 	case KVM_CAP_IRQCHIP:
-	case KVM_CAP_IRQFD:
 	case KVM_CAP_IOEVENTFD:
 	case KVM_CAP_DEVICE_CTRL:
 	case KVM_CAP_USER_MEMORY:
include/uapi/linux/kvm.h +0 -0
index 4b60056..2fa7302 100644

include/uapi/linux/kvm.h struct kvm_xen_hvm_config { · line 900

Quoted 8 lines

include/uapi/linux/kvm.h +1 -1

@@ -894,7 +894,7 @@ struct kvm_xen_hvm_config {
  *
  * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
  * the irqfd to operate in resampling mode for level triggered interrupt
- * emlation.  See Documentation/virtual/kvm/api.txt.
+ * emulation.  See Documentation/virtual/kvm/api.txt.
  */
 #define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)

Acked-by Paolo Bonzini <[email protected]>

Christoffer/Marc, please apply to the ARM tree in order to avoid pointless conflicts in kvm_vm_ioctl_check_extension.

Paolo

Christoffer Dall

Applied

2015-05-05 12:21 UTC #2 lore raw

Quoted 57 lines · Paolo Bonzini

Quoted 43 lines · Tiejun Chen
We already check KVM_CAP_IRQFD in generic once enable CONFIG_HAVE_KVM_IRQFD,
kvm_vm_ioctl_check_extension_generic()
|
+ switch (arg) {
+ ...
+ #ifdef CONFIG_HAVE_KVM_IRQFD
+ case KVM_CAP_IRQFD:
+ #endif
+ ...
+ return 1;
+ ...
+ }
|
+ kvm_vm_ioctl_check_extension()
So its not necessary to check this in arch again, and also fix one typo, s/emlation/emulation.
Signed-off-by Tiejun Chen <[email protected]>
---
 arch/arm/kvm/arm.c       | 1 -
 include/uapi/linux/kvm.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/kvm/arm.c +0 -1
index d9631ec..483b5d1 100644
@@ -171,7 +171,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	int r;
 	switch (ext) {
 	case KVM_CAP_IRQCHIP:
-	case KVM_CAP_IRQFD:
 	case KVM_CAP_IOEVENTFD:
 	case KVM_CAP_DEVICE_CTRL:
 	case KVM_CAP_USER_MEMORY:
include/uapi/linux/kvm.h +0 -0
index 4b60056..2fa7302 100644
include/uapi/linux/kvm.h struct kvm_xen_hvm_config { · line 900
Quoted 8 lines
include/uapi/linux/kvm.h +1 -1
@@ -894,7 +894,7 @@ struct kvm_xen_hvm_config {
  *
  * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
  * the irqfd to operate in resampling mode for level triggered interrupt
- * emlation.  See Documentation/virtual/kvm/api.txt.
+ * emulation.  See Documentation/virtual/kvm/api.txt.
  */
 #define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
 
Acked-by Paolo Bonzini <[email protected]>

Quoted 3 lines

Christoffer/Marc, please apply to the ARM tree in order to avoid pointless conflicts in kvm_vm_ioctl_check_extension.

Applied, thanks.

-Christoffer