qemu-kvm: Fix some libkvm warnings
Signed-off-by Jan Kiszka <[email protected]>
kvm/libkvm/kvm-common.h +1 -1
@@ -22,7 +22,7 @@#define KVM_MAX_NUM_MEM_REGIONS 1u#define MAX_VCPUS 64#define LIBKVM_S390_ORIGIN (0UL) -#elif __ia64__ +#elif defined(__ia64__)#define KVM_MAX_NUM_MEM_REGIONS 32u#define MAX_VCPUS 256#else
kvm/libkvm/libkvm-x86.c +1 -1
@@ -52,7 +52,7 @@ static int kvm_init_tss(kvm_context_t kvm)return 0 ; } -int kvm_create_pit (kvm_context_t kvm) +static int kvm_create_pit (kvm_context_t kvm) {#ifdef KVM_CAP_PIT int r;
kvm/libkvm/libkvm.c +15 -13
@@ -1158,6 +1158,19 @@ static int kvm_old_assign_irq(kvm_context_t kvm,return ret; } +int kvm_destroy_memory_region_works (kvm_context_t kvm) +{ +int ret =0 ; + +#ifdef KVM_CAP_DESTROY_MEMORY_REGION_WORKS + ret =ioctl (kvm->fd,KVM_CHECK_EXTENSION , +KVM_CAP_DESTROY_MEMORY_REGION_WORKS ); +if (ret <=0 ) + ret =0 ; +#endif +return ret; +} +#ifdef KVM_CAP_ASSIGN_DEV_IRQ int kvm_assign_irq (kvm_context_t kvm,struct kvm_assigned_irq *assigned_irq)
@@ -1209,19 +1222,7 @@ int kvm_deassign_pci_device(kvm_context_t kvm, }#endif -int kvm_destroy_memory_region_works (kvm_context_t kvm) -{ -int ret =0 ; - -#ifdef KVM_CAP_DESTROY_MEMORY_REGION_WORKS - ret =ioctl (kvm->fd,KVM_CHECK_EXTENSION , -KVM_CAP_DESTROY_MEMORY_REGION_WORKS ); -if (ret <=0 ) - ret =0 ; -#endif -return ret; -} - +#ifdef KVM_CAP_PIT int kvm_reinject_control (kvm_context_t kvm,int pit_reinject) {#ifdef KVM_CAP_REINJECT_CONTROL
@@ -1240,6 +1241,7 @@ int kvm_reinject_control(kvm_context_t kvm, int pit_reinject)#endif return -ENOSYS; } +#endif int kvm_has_gsi_routing (kvm_context_t kvm) {