[PATCH 090/128] KVM: selftests: Make arm64's guest_get_vcpuid() declaration arm64-only

Sean Christopherson
2022-05-04T22:56:38Z

Move the declaration of guest_get_vcpuid() to include/aarch64/processor.h,
it is implemented and used only by arm64.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
tools/testing/selftests/kvm/include/aarch64/processor.h | 2 ++
tools/testing/selftests/kvm/include/kvm_util_base.h | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h
index 8f9f46979a00..9a430980100e 100644
--- a/tools/testing/selftests/kvm/include/aarch64/processor.h
+++ b/tools/testing/selftests/kvm/include/aarch64/processor.h
@@ -185,4 +185,6 @@ static inline void local_irq_disable(void)
asm volatile("msr daifset, #3" : : : "memory");
}

+uint32_t guest_get_vcpuid(void);
+
#endif /* SELFTEST_KVM_PROCESSOR_H */
diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index 4487d5bce9b4..f621f7ffc150 100644
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -706,6 +706,4 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,

void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid);

-uint32_t guest_get_vcpuid(void);
-
#endif /* SELFTEST_KVM_UTIL_BASE_H */
--
2.36.0.464.gb9c8b46e94-goog