From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05A0DC282DD for ; Thu, 23 May 2019 17:58:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D98E32186A for ; Thu, 23 May 2019 17:58:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731531AbfEWR6D (ORCPT ); Thu, 23 May 2019 13:58:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44012 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731311AbfEWR6C (ORCPT ); Thu, 23 May 2019 13:58:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7F623086239; Thu, 23 May 2019 17:58:01 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.43.2.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 75D1F100200D; Thu, 23 May 2019 17:57:55 +0000 (UTC) Date: Thu, 23 May 2019 19:57:53 +0200 From: Andrew Jones To: Thomas Huth Cc: Christian Borntraeger , Janosch Frank , kvm@vger.kernel.org, Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Shuah Khan , David Hildenbrand , Cornelia Huck , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org Subject: Re: [PATCH 2/9] KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS Message-ID: <20190523175753.fpfapsh2hg3pjpqe@kamzik.brq.redhat.com> References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-3-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190523164309.13345-3-thuth@redhat.com> User-Agent: NeoMutt/20180716 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 23 May 2019 17:58:02 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 23, 2019 at 06:43:02PM +0200, Thomas Huth wrote: > 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 > Signed-off-by: Thomas Huth > --- > 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 > Reviewed-by: Andrew Jones