Commit 2b7deea3 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

Revert "kvm: selftests: move base kvm_util.h declarations to kvm_util_base.h" 



Effectively revert the movement of code from kvm_util.h => kvm_util_base.h,
as the TL;DR of the justification for the move was to avoid #idefs and/or
circular dependencies between what ended up being ucall_common.h and what
was (and now again, is), kvm_util.h.

But avoiding #ifdef and circular includes is trivial: don't do that.  The
cost of removing kvm_util_base.h is a few extra includes of ucall_common.h,
but that cost is practically nothing.  On the other hand, having a "base"
version of a header that is really just the header itself is confusing,
and makes it weird/hard to choose names for headers that actually are
"base" headers, e.g. to hold core KVM selftests typedefs.

For all intents and purposes, this reverts commit
7d9a662e.

Reviewed-by: default avatarAckerley Tng <ackerleytng@google.com>
Link: https://lore.kernel.org/r/20240314232637.2538648-2-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 87aa264c

tools/testing/selftests/kvm/aarch64/arch_timer.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "gic.h"

#include "processor.h"

#include "timer_test.h"

#include "ucall_common.h"

#include "vgic.h"



#define GICD_BASE_GPA			0x8000000ULL

tools/testing/selftests/kvm/arch_timer.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <sys/sysinfo.h>



#include "timer_test.h"

#include "ucall_common.h"



struct test_args test_args = {

	.nr_vcpus = NR_VCPUS_DEF,

tools/testing/selftests/kvm/demand_paging_test.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "test_util.h"

#include "memstress.h"

#include "guest_modes.h"

#include "ucall_common.h"

#include "userfaultfd_util.h"



#ifdef __NR_userfaultfd

tools/testing/selftests/kvm/dirty_log_perf_test.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "test_util.h"

#include "memstress.h"

#include "guest_modes.h"

#include "ucall_common.h"



#ifdef __aarch64__

#include "aarch64/vgic.h"

tools/testing/selftests/kvm/dirty_log_test.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "test_util.h"

#include "guest_modes.h"

#include "processor.h"

#include "ucall_common.h"



#define DIRTY_MEM_BITS 30 /* 1G */

#define PAGE_SHIFT_4K  12