All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
	Janosch Frank <frankja@linux.ibm.com>,
	kvm@vger.kernel.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	"Shuah Khan" <shuah@kernel.org>,
	"David Hildenbrand" <david@redhat.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Andrew Jones" <drjones@redhat.com>,
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
	linux-s390@vger.kernel.org
Subject: [PATCH 2/9] KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS
Date: Thu, 23 May 2019 18:43:02 +0200	[thread overview]
Message-ID: <20190523164309.13345-3-thuth@redhat.com> (raw)
In-Reply-To: <20190523164309.13345-1-thuth@redhat.com>

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


WARNING: multiple messages have this Message-ID (diff)
From: thuth at redhat.com (Thomas Huth)
Subject: [PATCH 2/9] KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS
Date: Thu, 23 May 2019 18:43:02 +0200	[thread overview]
Message-ID: <20190523164309.13345-3-thuth@redhat.com> (raw)
In-Reply-To: <20190523164309.13345-1-thuth@redhat.com>

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 at redhat.com>
Signed-off-by: Thomas Huth <thuth at 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

WARNING: multiple messages have this Message-ID (diff)
From: thuth@redhat.com (Thomas Huth)
Subject: [PATCH 2/9] KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS
Date: Thu, 23 May 2019 18:43:02 +0200	[thread overview]
Message-ID: <20190523164309.13345-3-thuth@redhat.com> (raw)
Message-ID: <20190523164302.BKlClYnwOPRcZSR4jFCHb_a80OqAPrDJ68nvaz3YJVs@z> (raw)
In-Reply-To: <20190523164309.13345-1-thuth@redhat.com>

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 at redhat.com>
Signed-off-by: Thomas Huth <thuth at 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

  parent reply	other threads:[~2019-05-23 16:43 UTC|newest]

Thread overview: 108+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-23 16:43 [PATCH v1 0/9] KVM selftests for s390x Thomas Huth
2019-05-23 16:43 ` Thomas Huth
2019-05-23 16:43 ` thuth
2019-05-23 16:43 ` [PATCH 1/9] KVM: selftests: Wrap vcpu_nested_state_get/set functions with x86 guard Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 16:43 ` Thomas Huth [this message]
2019-05-23 16:43   ` [PATCH 2/9] KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 17:57   ` Andrew Jones
2019-05-23 17:57     ` Andrew Jones
2019-05-23 17:57     ` drjones
2019-05-23 16:43 ` [PATCH 3/9] kvm: selftests: aarch64: fix default vm mode Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-24  8:37   ` Christian Borntraeger
2019-05-24  8:37     ` Christian Borntraeger
2019-05-24  8:37     ` borntraeger
2019-05-23 16:43 ` [PATCH 4/9] KVM: selftests: Introduce a VM_MODE_DEFAULT macro for the default bits Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 17:20   ` Andrew Jones
2019-05-23 17:20     ` Andrew Jones
2019-05-23 17:20     ` drjones
2019-05-23 16:43 ` [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 17:40   ` Andrew Jones
2019-05-23 17:40     ` Andrew Jones
2019-05-23 17:40     ` drjones
2019-05-24  8:29     ` Christian Borntraeger
2019-05-24  8:29       ` Christian Borntraeger
2019-05-24  8:29       ` borntraeger
2019-05-24 18:17       ` Thomas Huth
2019-05-24 18:17         ` Thomas Huth
2019-05-24 18:17         ` thuth
2019-05-23 16:43 ` [PATCH 6/9] KVM: selftests: Add processor code for s390x Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 16:43 ` [PATCH 7/9] KVM: selftests: Add the sync_regs test " Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 16:43 ` [PATCH 8/9] KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 17:56   ` Andrew Jones
2019-05-23 17:56     ` Andrew Jones
2019-05-23 17:56     ` drjones
2019-05-24  9:13   ` Cornelia Huck
2019-05-24  9:13     ` Cornelia Huck
2019-05-24  9:13     ` cohuck
2019-05-24  9:16   ` David Hildenbrand
2019-05-24  9:16     ` David Hildenbrand
2019-05-24  9:16     ` david
2019-05-28 11:00   ` Christian Borntraeger
2019-05-28 11:00     ` Christian Borntraeger
2019-05-28 11:00     ` borntraeger
2019-05-28 12:53     ` Cornelia Huck
2019-05-28 12:53       ` Cornelia Huck
2019-05-28 12:53       ` cohuck
2019-05-28 13:48       ` Christian Borntraeger
2019-05-28 13:48         ` Christian Borntraeger
2019-05-28 13:48         ` borntraeger
2019-05-23 16:43 ` [PATCH 9/9] KVM: selftests: Move kvm_create_max_vcpus test to generic code Thomas Huth
2019-05-23 16:43   ` Thomas Huth
2019-05-23 16:43   ` thuth
2019-05-23 17:56   ` Andrew Jones
2019-05-23 17:56     ` Andrew Jones
2019-05-23 17:56     ` drjones
2019-05-24  9:16   ` David Hildenbrand
2019-05-24  9:16     ` David Hildenbrand
2019-05-24  9:16     ` david
2019-05-24 10:33 ` [PATCH] KVM: selftests: enable pgste option for the linker on s390 Christian Borntraeger
2019-05-24 10:33   ` Christian Borntraeger
2019-05-24 10:33   ` borntraeger
2019-05-24 18:16   ` Thomas Huth
2019-05-24 18:16     ` Thomas Huth
2019-05-24 18:16     ` thuth
2019-05-24 19:07   ` David Hildenbrand
2019-05-24 19:07     ` David Hildenbrand
2019-05-24 19:07     ` david
2019-05-27 11:44   ` Christian Borntraeger
2019-05-27 11:44     ` Christian Borntraeger
2019-05-27 11:44     ` borntraeger
2019-05-24 11:11 ` [PATCH v1 0/9] KVM selftests for s390x Christian Borntraeger
2019-05-24 11:11   ` Christian Borntraeger
2019-05-24 11:11   ` borntraeger
2019-05-24 12:17   ` Christian Borntraeger
2019-05-24 12:17     ` Christian Borntraeger
2019-05-24 12:17     ` borntraeger
2019-05-24 12:29     ` Christian Borntraeger
2019-05-24 12:29       ` Christian Borntraeger
2019-05-24 12:29       ` borntraeger
2019-05-24 12:36       ` David Hildenbrand
2019-05-24 12:36         ` David Hildenbrand
2019-05-24 12:36         ` david
2019-05-24 12:56         ` Christian Borntraeger
2019-05-24 12:56           ` Christian Borntraeger
2019-05-24 12:56           ` borntraeger
2019-05-24 18:33 ` Christian Borntraeger
2019-05-24 18:33   ` Christian Borntraeger
2019-05-24 18:33   ` borntraeger
2019-06-04 17:19 ` Paolo Bonzini
2019-06-04 17:19   ` Paolo Bonzini
2019-06-04 17:19   ` pbonzini
2019-06-04 17:37   ` Christian Borntraeger
2019-06-04 17:37     ` Christian Borntraeger
2019-06-04 17:37     ` borntraeger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190523164309.13345-3-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=drjones@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.com \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.