* [PATCH] kvm: remove one useless check extension
@ 2015-05-04 2:48 Tiejun Chen
2015-05-04 9:24 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Tiejun Chen @ 2015-05-04 2:48 UTC (permalink / raw)
To: pbonzini; +Cc: kvm
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 <tiejun.chen@intel.com>
---
arch/arm/kvm/arm.c | 1 -
include/uapi/linux/kvm.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index d9631ec..483b5d1 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -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:
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 4b60056..2fa7302 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -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)
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] kvm: remove one useless check extension
2015-05-04 2:48 [PATCH] kvm: remove one useless check extension Tiejun Chen
@ 2015-05-04 9:24 ` Paolo Bonzini
2015-05-05 12:21 ` Christoffer Dall
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Bonzini @ 2015-05-04 9:24 UTC (permalink / raw)
To: Tiejun Chen
Cc: kvm, kvmarm@lists.cs.columbia.edu, Marc Zyngier, Christoffer Dall
On 04/05/2015 04:48, Tiejun Chen wrote:
> 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 <tiejun.chen@intel.com>
> ---
> arch/arm/kvm/arm.c | 1 -
> include/uapi/linux/kvm.h | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> index d9631ec..483b5d1 100644
> --- a/arch/arm/kvm/arm.c
> +++ b/arch/arm/kvm/arm.c
> @@ -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:
> diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
> index 4b60056..2fa7302 100644
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@ -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 <pbonzini@redhat.com>
Christoffer/Marc, please apply to the ARM tree in order to avoid
pointless conflicts in kvm_vm_ioctl_check_extension.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] kvm: remove one useless check extension
2015-05-04 9:24 ` Paolo Bonzini
@ 2015-05-05 12:21 ` Christoffer Dall
0 siblings, 0 replies; 3+ messages in thread
From: Christoffer Dall @ 2015-05-05 12:21 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Tiejun Chen, kvm, kvmarm@lists.cs.columbia.edu, Marc Zyngier
On Mon, May 04, 2015 at 11:24:22AM +0200, Paolo Bonzini wrote:
>
>
> On 04/05/2015 04:48, Tiejun Chen wrote:
> > 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 <tiejun.chen@intel.com>
> > ---
> > arch/arm/kvm/arm.c | 1 -
> > include/uapi/linux/kvm.h | 2 +-
> > 2 files changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> > index d9631ec..483b5d1 100644
> > --- a/arch/arm/kvm/arm.c
> > +++ b/arch/arm/kvm/arm.c
> > @@ -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:
> > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
> > index 4b60056..2fa7302 100644
> > --- a/include/uapi/linux/kvm.h
> > +++ b/include/uapi/linux/kvm.h
> > @@ -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 <pbonzini@redhat.com>
>
> Christoffer/Marc, please apply to the ARM tree in order to avoid
> pointless conflicts in kvm_vm_ioctl_check_extension.
>
Applied, thanks.
-Christoffer
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-05 12:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-04 2:48 [PATCH] kvm: remove one useless check extension Tiejun Chen
2015-05-04 9:24 ` Paolo Bonzini
2015-05-05 12:21 ` Christoffer Dall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox