From 518128ecb0c4a00956f2c6437fbd0b40e895b6c9 Mon Sep 17 00:00:00 2001 From: Zhang Xiantao Date: Wed, 14 Nov 2007 19:57:33 +0800 Subject: [PATCH] Move KVM_CHECK_EXTENSION case to arch, since different archs have different Capability Signed-off-by: Zhang Xiantao --- drivers/kvm/kvm_main.c | 17 ----------------- drivers/kvm/x86.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index fb939ab..2bac22b 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -1244,23 +1244,6 @@ static long kvm_dev_ioctl(struct file *filp, goto out; r = kvm_dev_ioctl_create_vm(); break; - case KVM_CHECK_EXTENSION: { - int ext = (long)argp; - - switch (ext) { - case KVM_CAP_IRQCHIP: - case KVM_CAP_HLT: - case KVM_CAP_MMU_SHADOW_CACHE_CONTROL: - case KVM_CAP_USER_MEMORY: - case KVM_CAP_SET_TSS_ADDR: - r = 1; - break; - default: - r = 0; - break; - } - break; - } case KVM_GET_VCPU_MMAP_SIZE: r = -EINVAL; if (arg) diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c index aa6c3d8..9f101c5 100644 --- a/drivers/kvm/x86.c +++ b/drivers/kvm/x86.c @@ -567,6 +567,23 @@ long kvm_arch_dev_ioctl(struct file *filp, long r; switch (ioctl) { + case KVM_CHECK_EXTENSION: { + int ext = (long)argp; + + switch (ext) { + case KVM_CAP_IRQCHIP: + case KVM_CAP_HLT: + case KVM_CAP_MMU_SHADOW_CACHE_CONTROL: + case KVM_CAP_USER_MEMORY: + case KVM_CAP_SET_TSS_ADDR: + r = 1; + break; + default: + r = 0; + break; + } + break; + } case KVM_GET_MSR_INDEX_LIST: { struct kvm_msr_list __user *user_msr_list = argp; struct kvm_msr_list msr_list; -- 1.5.1.2