Commit 14a09518 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Marcelo Tosatti
Browse files

kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension() 



simple cleanup and use existing helper: kvm_check_extension().

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 276ce815

kvm-all.c

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ int kvm_init(int smp_cpus) 


    s->broken_set_mem_region = 1;

#ifdef KVM_CAP_JOIN_MEMORY_REGIONS_WORKS

    ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_JOIN_MEMORY_REGIONS_WORKS);

    ret = kvm_check_extension(s, KVM_CAP_JOIN_MEMORY_REGIONS_WORKS);

    if (ret > 0) {

        s->broken_set_mem_region = 0;

    }

target-i386/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, 
{

    int r;



    r = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_MCE);

    r = kvm_check_extension(s, KVM_CAP_MCE);

    if (r > 0) {

        *max_banks = r;

        return kvm_ioctl(s, KVM_X86_GET_MCE_CAP_SUPPORTED, mce_cap);
@@ -540,7 +540,7 @@ int kvm_arch_init(KVMState *s, int smp_cpus) 
     * versions of KVM just assumed that it would be at the end of physical

     * memory but that doesn't work with more than 4GB of memory.  We simply

     * refuse to work with those older versions of KVM. */

    ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_SET_TSS_ADDR);

    ret = kvm_check_extension(s, KVM_CAP_SET_TSS_ADDR);

    if (ret <= 0) {

        fprintf(stderr, "kvm does not support KVM_CAP_SET_TSS_ADDR\n");

        return ret;