openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Lai Jiangshan 2010-12-10 15:52:36 +08:00 committed by Marcelo Tosatti
parent 276ce81563
commit 14a095184c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kvm-all.c
View File

@ -717,7 +717,7 @@ int kvm_init(int smp_cpus)
s->broken_set_mem_region = 1; s->broken_set_mem_region = 1;
#ifdef KVM_CAP_JOIN_MEMORY_REGIONS_WORKS #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) { if (ret > 0) {
s->broken_set_mem_region = 0; s->broken_set_mem_region = 0;
} }

4
target-i386/kvm.c
View File

@ -187,7 +187,7 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap,
{ {
int r; int r;
r = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_MCE); r = kvm_check_extension(s, KVM_CAP_MCE);
if (r > 0) { if (r > 0) {
*max_banks = r; *max_banks = r;
return kvm_ioctl(s, KVM_X86_GET_MCE_CAP_SUPPORTED, mce_cap); 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 * 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 * memory but that doesn't work with more than 4GB of memory. We simply
* refuse to work with those older versions of KVM. */ * 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) { if (ret <= 0) {
fprintf(stderr, "kvm does not support KVM_CAP_SET_TSS_ADDR\n"); fprintf(stderr, "kvm does not support KVM_CAP_SET_TSS_ADDR\n");
return ret; return ret;