From c87a097b4ab59aaf0428361586d81cef425536f3 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 20 May 2009 15:36:12 -0300 Subject: [PATCH] Introduce kvm_check_extension to check if KVM extensions are supported Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa Signed-off-by: Anthony Liguori --- kvm-all.c | 39 ++++++++++++++++++++++----------------- kvm.h | 2 ++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 7435d6794c..541b200e38 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -280,6 +280,18 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size) return ret; } +int kvm_check_extension(KVMState *s, unsigned int extension) +{ + int ret; + + ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, extension); + if (ret < 0) { + ret = 0; + } + + return ret; +} + int kvm_init(int smp_cpus) { KVMState *s; @@ -327,10 +339,8 @@ int kvm_init(int smp_cpus) * just use a user allocated buffer so we can use phys_ram_base * unmodified. Make sure we have a sufficiently modern version of KVM. */ - ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_USER_MEMORY); - if (ret <= 0) { - if (ret == 0) - ret = -EINVAL; + if (!kvm_check_extension(s, KVM_CAP_USER_MEMORY)) { + ret = -EINVAL; fprintf(stderr, "kvm does not support KVM_CAP_USER_MEMORY\n"); goto err; } @@ -338,11 +348,8 @@ int kvm_init(int smp_cpus) /* There was a nasty bug in < kvm-80 that prevents memory slots from being * destroyed properly. Since we rely on this capability, refuse to work * with any kernel without this capability. */ - ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, - KVM_CAP_DESTROY_MEMORY_REGION_WORKS); - if (ret <= 0) { - if (ret == 0) - ret = -EINVAL; + if (!kvm_check_extension(s, KVM_CAP_DESTROY_MEMORY_REGION_WORKS)) { + ret = -EINVAL; fprintf(stderr, "KVM kernel module broken (DESTROY_MEMORY_REGION)\n" @@ -350,11 +357,10 @@ int kvm_init(int smp_cpus) goto err; } - s->coalesced_mmio = 0; #ifdef KVM_CAP_COALESCED_MMIO - ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO); - if (ret > 0) - s->coalesced_mmio = ret; + s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO); +#else + s->coalesced_mmio = 0; #endif ret = kvm_arch_init(s, smp_cpus); @@ -652,11 +658,10 @@ int kvm_has_sync_mmu(void) #ifdef KVM_CAP_SYNC_MMU KVMState *s = kvm_state; - if (kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_SYNC_MMU) > 0) - return 1; -#endif - + return kvm_check_extension(s, KVM_CAP_SYNC_MMU); +#else return 0; +#endif } void kvm_setup_guest_memory(void *start, size_t size) diff --git a/kvm.h b/kvm.h index 5a52f51cb9..cf6c799a85 100644 --- a/kvm.h +++ b/kvm.h @@ -78,4 +78,6 @@ int kvm_arch_init(KVMState *s, int smp_cpus); int kvm_arch_init_vcpu(CPUState *env); +int kvm_check_extension(KVMState *s, unsigned int extension); + #endif -- 2.11.4.GIT