Skip to content

Commit 17da79e

Browse files
jones-drewavpatel
authored andcommitted
KVM: arm64: selftests: Split get-reg-list test code
Split the arch-neutral test code out of aarch64/get-reg-list.c into get-reg-list.c. To do this we invent a new make variable $(SPLIT_TESTS) which expects common parts to be in the KVM selftests root and the counterparts to have the same name, but be in $(ARCH_DIR). There's still some work to be done to de-aarch64 the common get-reg-list.c, but we leave that to the next patch to avoid modifying too much code while moving it. Signed-off-by: Andrew Jones <[email protected]> Signed-off-by: Haibo Xu <[email protected]> Signed-off-by: Anup Patel <[email protected]>
1 parent 0ace6bd commit 17da79e

File tree

3 files changed

+398
-358
lines changed

3 files changed

+398
-358
lines changed

tools/testing/selftests/kvm/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ TEST_GEN_PROGS_EXTENDED_x86_64 += x86_64/nx_huge_pages_test
140140
TEST_GEN_PROGS_aarch64 += aarch64/aarch32_id_regs
141141
TEST_GEN_PROGS_aarch64 += aarch64/arch_timer
142142
TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions
143-
TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list
144143
TEST_GEN_PROGS_aarch64 += aarch64/hypercalls
145144
TEST_GEN_PROGS_aarch64 += aarch64/page_fault_test
146145
TEST_GEN_PROGS_aarch64 += aarch64/psci_test
@@ -152,6 +151,7 @@ TEST_GEN_PROGS_aarch64 += access_tracking_perf_test
152151
TEST_GEN_PROGS_aarch64 += demand_paging_test
153152
TEST_GEN_PROGS_aarch64 += dirty_log_test
154153
TEST_GEN_PROGS_aarch64 += dirty_log_perf_test
154+
TEST_GEN_PROGS_aarch64 += get-reg-list
155155
TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
156156
TEST_GEN_PROGS_aarch64 += kvm_page_table_test
157157
TEST_GEN_PROGS_aarch64 += memslot_modification_stress_test
@@ -181,6 +181,8 @@ TEST_GEN_PROGS_riscv += kvm_page_table_test
181181
TEST_GEN_PROGS_riscv += set_memory_region_test
182182
TEST_GEN_PROGS_riscv += kvm_binary_stats_test
183183

184+
SPLIT_TESTS += get-reg-list
185+
184186
TEST_PROGS += $(TEST_PROGS_$(ARCH_DIR))
185187
TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH_DIR))
186188
TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH_DIR))
@@ -228,19 +230,25 @@ LIBKVM_C_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_C))
228230
LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S))
229231
LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING))
230232
LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ)
233+
SPLIT_TESTS_TARGETS := $(patsubst %, $(OUTPUT)/%, $(SPLIT_TESTS))
234+
SPLIT_TESTS_OBJS := $(patsubst %, $(ARCH_DIR)/%.o, $(SPLIT_TESTS))
231235

232236
TEST_GEN_OBJ = $(patsubst %, %.o, $(TEST_GEN_PROGS))
233237
TEST_GEN_OBJ += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED))
234238
TEST_DEP_FILES = $(patsubst %.o, %.d, $(TEST_GEN_OBJ))
235239
TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBKVM_OBJS))
240+
TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TESTS_OBJS))
236241
-include $(TEST_DEP_FILES)
237242

238243
$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): %: %.o
239244
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $< $(LIBKVM_OBJS) $(LDLIBS) -o $@
240245
$(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c
241246
$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
242247

243-
EXTRA_CLEAN += $(LIBKVM_OBJS) $(TEST_DEP_FILES) $(TEST_GEN_OBJ) cscope.*
248+
$(SPLIT_TESTS_TARGETS): %: %.o $(SPLIT_TESTS_OBJS)
249+
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
250+
251+
EXTRA_CLEAN += $(LIBKVM_OBJS) $(TEST_DEP_FILES) $(TEST_GEN_OBJ) $(SPLIT_TESTS_OBJS) cscope.*
244252

245253
x := $(shell mkdir -p $(sort $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ))))
246254
$(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c

0 commit comments

Comments
 (0)