diff options
| author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2010-12-10 15:52:36 +0800 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-01-21 14:05:21 -0200 |
| commit | 14a095184c6068c78e67f17c200cf00b4170f704 (patch) | |
| tree | 1d78555f17fb0627758577c9934d877b859628f6 | |
| parent | 276ce81563aeadea5493fbc4fbc84647d5bfbdeb (diff) | |
kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension()
simple cleanup and use existing helper: kvm_check_extension().
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | kvm-all.c | 2 | ||||
| -rw-r--r-- | target-i386/kvm.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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; } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 755f8c9089..4004de76dd 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -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; |