lkml.org 
[lkml]   [2019]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/9] KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS
    Date
    The struct kvm_vcpu_events code is only available on certain architectures
    (arm, arm64 and x86). To be able to compile kvm_util.c also for other
    architectures, we have to fence the code with __KVM_HAVE_VCPU_EVENTS.

    Reviewed-by: David Hildenbrand <david@redhat.com>
    Signed-off-by: Thomas Huth <thuth@redhat.com>
    ---
    tools/testing/selftests/kvm/include/kvm_util.h | 2 ++
    tools/testing/selftests/kvm/lib/kvm_util.c | 2 ++
    2 files changed, 4 insertions(+)

    diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
    index a5a4b28f14d8..b8bf961074fe 100644
    --- a/tools/testing/selftests/kvm/include/kvm_util.h
    +++ b/tools/testing/selftests/kvm/include/kvm_util.h
    @@ -114,10 +114,12 @@ void vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid,
    struct kvm_sregs *sregs);
    int _vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid,
    struct kvm_sregs *sregs);
    +#ifdef __KVM_HAVE_VCPU_EVENTS
    void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
    struct kvm_vcpu_events *events);
    void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
    struct kvm_vcpu_events *events);
    +#endif
    #ifdef __x86_64__
    void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
    struct kvm_nested_state *state);
    diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
    index ba1359ac504f..08edb8436c47 100644
    --- a/tools/testing/selftests/kvm/lib/kvm_util.c
    +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
    @@ -1224,6 +1224,7 @@ void vcpu_regs_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_regs *regs)
    ret, errno);
    }

    +#ifdef __KVM_HAVE_VCPU_EVENTS
    void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
    struct kvm_vcpu_events *events)
    {
    @@ -1249,6 +1250,7 @@ void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
    TEST_ASSERT(ret == 0, "KVM_SET_VCPU_EVENTS, failed, rc: %i errno: %i",
    ret, errno);
    }
    +#endif

    #ifdef __x86_64__
    void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-05-23 18:44    [W:3.322 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site