149 lines
4.5 KiB
Diff
149 lines
4.5 KiB
Diff
From: Alexander Graf <agraf@suse.de>
|
|
Date: Mon, 14 Jul 2014 18:27:35 +0200
|
|
Subject: KVM: Rename and add argument to check_extension
|
|
Origin: https://git.kernel.org/linus/784aa3d7fb6f729c06d5836c9d9569f58e4d05ae
|
|
|
|
In preparation to make the check_extension function available to VM scope
|
|
we add a struct kvm * argument to the function header and rename the function
|
|
accordingly. It will still be called from the /dev/kvm fd, but with a NULL
|
|
argument for struct kvm *.
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
arch/arm/kvm/arm.c | 2 +-
|
|
arch/ia64/kvm/kvm-ia64.c | 2 +-
|
|
arch/mips/kvm/kvm_mips.c | 2 +-
|
|
arch/powerpc/kvm/powerpc.c | 2 +-
|
|
arch/s390/kvm/kvm-s390.c | 2 +-
|
|
arch/x86/kvm/x86.c | 2 +-
|
|
include/linux/kvm_host.h | 2 +-
|
|
virt/kvm/kvm_main.c | 6 +++---
|
|
8 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
|
|
index 3c82b37..cb77f999 100644
|
|
--- a/arch/arm/kvm/arm.c
|
|
+++ b/arch/arm/kvm/arm.c
|
|
@@ -184,7 +184,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
|
|
}
|
|
}
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext)
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
{
|
|
int r;
|
|
switch (ext) {
|
|
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
|
|
index 6a4309b..0729ba6 100644
|
|
--- a/arch/ia64/kvm/kvm-ia64.c
|
|
+++ b/arch/ia64/kvm/kvm-ia64.c
|
|
@@ -190,7 +190,7 @@ void kvm_arch_check_processor_compat(void *rtn)
|
|
*(int *)rtn = 0;
|
|
}
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext)
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
{
|
|
|
|
int r;
|
|
diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
|
|
index d687c6e..3ca79aa 100644
|
|
--- a/arch/mips/kvm/kvm_mips.c
|
|
+++ b/arch/mips/kvm/kvm_mips.c
|
|
@@ -885,7 +885,7 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
|
|
return VM_FAULT_SIGBUS;
|
|
}
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext)
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
{
|
|
int r;
|
|
|
|
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
|
|
index 8e03568..d870bac 100644
|
|
--- a/arch/powerpc/kvm/powerpc.c
|
|
+++ b/arch/powerpc/kvm/powerpc.c
|
|
@@ -391,7 +391,7 @@ void kvm_arch_sync_events(struct kvm *kvm)
|
|
{
|
|
}
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext)
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
{
|
|
int r;
|
|
/* FIXME!!
|
|
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
|
|
index 2f3e14f..00268ca 100644
|
|
--- a/arch/s390/kvm/kvm-s390.c
|
|
+++ b/arch/s390/kvm/kvm-s390.c
|
|
@@ -146,7 +146,7 @@ long kvm_arch_dev_ioctl(struct file *filp,
|
|
return -EINVAL;
|
|
}
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext)
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
{
|
|
int r;
|
|
|
|
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
index 5a8691b..5a62d91 100644
|
|
--- a/arch/x86/kvm/x86.c
|
|
+++ b/arch/x86/kvm/x86.c
|
|
@@ -2616,7 +2616,7 @@ out:
|
|
return r;
|
|
}
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext)
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
{
|
|
int r;
|
|
|
|
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
|
|
index ec4e3bd..5065b95 100644
|
|
--- a/include/linux/kvm_host.h
|
|
+++ b/include/linux/kvm_host.h
|
|
@@ -602,7 +602,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
|
|
unsigned int ioctl, unsigned long arg);
|
|
int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf);
|
|
|
|
-int kvm_dev_ioctl_check_extension(long ext);
|
|
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext);
|
|
|
|
int kvm_get_dirty_log(struct kvm *kvm,
|
|
struct kvm_dirty_log *log, int *is_dirty);
|
|
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
|
index 4b6c01b..e28f3ca 100644
|
|
--- a/virt/kvm/kvm_main.c
|
|
+++ b/virt/kvm/kvm_main.c
|
|
@@ -2571,7 +2571,7 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
|
|
return r;
|
|
}
|
|
|
|
-static long kvm_dev_ioctl_check_extension_generic(long arg)
|
|
+static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
|
|
{
|
|
switch (arg) {
|
|
case KVM_CAP_USER_MEMORY:
|
|
@@ -2595,7 +2595,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg)
|
|
default:
|
|
break;
|
|
}
|
|
- return kvm_dev_ioctl_check_extension(arg);
|
|
+ return kvm_vm_ioctl_check_extension(kvm, arg);
|
|
}
|
|
|
|
static long kvm_dev_ioctl(struct file *filp,
|
|
@@ -2614,7 +2614,7 @@ static long kvm_dev_ioctl(struct file *filp,
|
|
r = kvm_dev_ioctl_create_vm(arg);
|
|
break;
|
|
case KVM_CHECK_EXTENSION:
|
|
- r = kvm_dev_ioctl_check_extension_generic(arg);
|
|
+ r = kvm_vm_ioctl_check_extension_generic(NULL, arg);
|
|
break;
|
|
case KVM_GET_VCPU_MMAP_SIZE:
|
|
r = -EINVAL;
|
|
--
|
|
1.7.10.4
|
|
|