KVM: selftests: Fix unsupported $(ARCH) builds
Sean Christopherson
maintainercover KVM: selftests: Fix unsupported $(ARCH) builds
Play nice with treewrite builds of unsupported architectures, e.g. arm (32-bit), as KVM selftests' Makefile doesn't do anything to ensure the target architecture is actually one KVM selftests supports.
Patches 2-3 are opportunistic changes (since the above Makefile change will generate conflicts) to switch to using $(ARCH) instead of the target triple for arch specific directories, e.g. arm64 instead of aarch64, mainly so as not to be different from the rest of the kernel.
Compile tested on all architectures.
My thinking for applying this is to send a v2 just before (or even during) the 6.12 merge window and bribe Paolo into applying it directly, i.e. make this series deal with any conflicts.
Sean Christopherson (3):
KVM: selftests: Provide empty 'all' and 'clean' targets for
unsupported ARCHs
KVM: selftests: Use canonical $(ARCH) paths for KVM selftests
directories
KVM: selftests: Override ARCH for x86_64 instead of using ARCH_DIR
MAINTAINERS | 12 +-
tools/testing/selftests/kvm/Makefile | 333 +-----------------
tools/testing/selftests/kvm/Makefile.kvm | 315 +++++++++++++++++
.../kvm/{aarch64 => arm64}/aarch32_id_regs.c | 0
.../kvm/{aarch64 => arm64}/arch_timer.c | 0
.../kvm/{aarch64 => arm64}/debug-exceptions.c | 0
.../kvm/{aarch64 => arm64}/get-reg-list.c | 0
.../kvm/{aarch64 => arm64}/hypercalls.c | 0
.../kvm/{aarch64 => arm64}/page_fault_test.c | 0
.../kvm/{aarch64 => arm64}/psci_test.c | 0
.../kvm/{aarch64 => arm64}/set_id_regs.c | 0
.../kvm/{aarch64 => arm64}/smccc_filter.c | 0
.../{aarch64 => arm64}/vcpu_width_config.c | 0
.../kvm/{aarch64 => arm64}/vgic_init.c | 0
.../kvm/{aarch64 => arm64}/vgic_irq.c | 0
.../kvm/{aarch64 => arm64}/vgic_lpi_stress.c | 0
.../{aarch64 => arm64}/vpmu_counter_access.c | 0
.../selftests/kvm/dirty_log_perf_test.c | 2 +-
.../include/{aarch64 => arm64}/arch_timer.h | 0
.../kvm/include/{aarch64 => arm64}/delay.h | 0
.../kvm/include/{aarch64 => arm64}/gic.h | 0
.../kvm/include/{aarch64 => arm64}/gic_v3.h | 0
.../include/{aarch64 => arm64}/gic_v3_its.h | 0
.../{aarch64 => arm64}/kvm_util_arch.h | 0
.../include/{aarch64 => arm64}/processor.h | 0
.../kvm/include/{aarch64 => arm64}/spinlock.h | 0
.../kvm/include/{aarch64 => arm64}/ucall.h | 0
.../kvm/include/{aarch64 => arm64}/vgic.h | 0
.../{s390x => s390}/diag318_test_handler.h | 0
.../include/{s390x => s390}/kvm_util_arch.h | 0
.../kvm/include/{s390x => s390}/processor.h | 0
.../kvm/include/{s390x => s390}/ucall.h | 0
.../kvm/include/{x86_64 => x86}/apic.h | 0
.../kvm/include/{x86_64 => x86}/evmcs.h | 0
.../kvm/include/{x86_64 => x86}/hyperv.h | 0
.../include/{x86_64 => x86}/kvm_util_arch.h | 0
.../kvm/include/{x86_64 => x86}/mce.h | 0
.../kvm/include/{x86_64 => x86}/pmu.h | 0
.../kvm/include/{x86_64 => x86}/processor.h | 0
.../kvm/include/{x86_64 => x86}/sev.h | 0
.../kvm/include/{x86_64 => x86}/svm.h | 0
.../kvm/include/{x86_64 => x86}/svm_util.h | 0
.../kvm/include/{x86_64 => x86}/ucall.h | 0
.../kvm/include/{x86_64 => x86}/vmx.h | 0
.../kvm/lib/{aarch64 => arm64}/gic.c | 0
.../kvm/lib/{aarch64 => arm64}/gic_private.h | 0
.../kvm/lib/{aarch64 => arm64}/gic_v3.c | 0
.../kvm/lib/{aarch64 => arm64}/gic_v3_its.c | 0
.../kvm/lib/{aarch64 => arm64}/handlers.S | 0
.../kvm/lib/{aarch64 => arm64}/processor.c | 0
.../kvm/lib/{aarch64 => arm64}/spinlock.c | 0
.../kvm/lib/{aarch64 => arm64}/ucall.c | 0
.../kvm/lib/{aarch64 => arm64}/vgic.c | 0
.../{s390x => s390}/diag318_test_handler.c | 0
.../kvm/lib/{s390x => s390}/processor.c | 0
.../selftests/kvm/lib/{s390x => s390}/ucall.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/apic.c | 0
.../kvm/lib/{x86_64 => x86}/handlers.S | 0
.../kvm/lib/{x86_64 => x86}/hyperv.c | 0
.../kvm/lib/{x86_64 => x86}/memstress.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/pmu.c | 0
.../kvm/lib/{x86_64 => x86}/processor.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/sev.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/svm.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/ucall.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/vmx.c | 0
.../selftests/kvm/{s390x => s390}/cmma_test.c | 0
.../kvm/{s390x => s390}/debug_test.c | 0
.../selftests/kvm/{s390x => s390}/memop.c | 0
.../selftests/kvm/{s390x => s390}/resets.c | 0
.../{s390x => s390}/shared_zeropage_test.c | 0
.../kvm/{s390x => s390}/sync_regs_test.c | 0
.../selftests/kvm/{s390x => s390}/tprot.c | 0
.../selftests/kvm/{x86_64 => x86}/amx_test.c | 0
.../kvm/{x86_64 => x86}/apic_bus_clock_test.c | 0
.../kvm/{x86_64 => x86}/cpuid_test.c | 0
.../kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c | 0
.../kvm/{x86_64 => x86}/debug_regs.c | 0
.../dirty_log_page_splitting_test.c | 0
.../exit_on_emulation_failure_test.c | 0
.../kvm/{x86_64 => x86}/fix_hypercall_test.c | 0
.../kvm/{x86_64 => x86}/flds_emulation.h | 0
.../{x86_64 => x86}/get_msr_index_features.c | 0
.../kvm/{x86_64 => x86}/hwcr_msr_test.c | 0
.../kvm/{x86_64 => x86}/hyperv_clock.c | 0
.../kvm/{x86_64 => x86}/hyperv_cpuid.c | 0
.../kvm/{x86_64 => x86}/hyperv_evmcs.c | 0
.../hyperv_extended_hypercalls.c | 0
.../kvm/{x86_64 => x86}/hyperv_features.c | 0
.../kvm/{x86_64 => x86}/hyperv_ipi.c | 0
.../kvm/{x86_64 => x86}/hyperv_svm_test.c | 0
.../kvm/{x86_64 => x86}/hyperv_tlb_flush.c | 0
.../kvm/{x86_64 => x86}/kvm_clock_test.c | 0
.../kvm/{x86_64 => x86}/kvm_pv_test.c | 0
.../kvm/{x86_64 => x86}/max_vcpuid_cap_test.c | 0
.../kvm/{x86_64 => x86}/monitor_mwait_test.c | 0
.../{x86_64 => x86}/nested_exceptions_test.c | 0
.../kvm/{x86_64 => x86}/nx_huge_pages_test.c | 0
.../kvm/{x86_64 => x86}/nx_huge_pages_test.sh | 0
.../kvm/{x86_64 => x86}/platform_info_test.c | 0
.../kvm/{x86_64 => x86}/pmu_counters_test.c | 0
.../{x86_64 => x86}/pmu_event_filter_test.c | 0
.../private_mem_conversions_test.c | 0
.../private_mem_kvm_exits_test.c | 0
.../{x86_64 => x86}/recalc_apic_map_test.c | 0
.../kvm/{x86_64 => x86}/set_boot_cpu_id.c | 0
.../kvm/{x86_64 => x86}/set_sregs_test.c | 0
.../kvm/{x86_64 => x86}/sev_init2_tests.c | 0
.../kvm/{x86_64 => x86}/sev_migrate_tests.c | 0
.../kvm/{x86_64 => x86}/sev_smoke_test.c | 0
.../smaller_maxphyaddr_emulation_test.c | 0
.../selftests/kvm/{x86_64 => x86}/smm_test.c | 0
.../kvm/{x86_64 => x86}/state_test.c | 0
.../kvm/{x86_64 => x86}/svm_int_ctl_test.c | 0
.../svm_nested_shutdown_test.c | 0
.../svm_nested_soft_inject_test.c | 0
.../kvm/{x86_64 => x86}/svm_vmcall_test.c | 0
.../kvm/{x86_64 => x86}/sync_regs_test.c | 0
.../{x86_64 => x86}/triple_fault_event_test.c | 0
.../kvm/{x86_64 => x86}/tsc_msrs_test.c | 0
.../kvm/{x86_64 => x86}/tsc_scaling_sync.c | 0
.../kvm/{x86_64 => x86}/ucna_injection_test.c | 0
.../kvm/{x86_64 => x86}/userspace_io_test.c | 0
.../{x86_64 => x86}/userspace_msr_exit_test.c | 0
.../{x86_64 => x86}/vmx_apic_access_test.c | 0
.../vmx_close_while_nested_test.c | 0
.../kvm/{x86_64 => x86}/vmx_dirty_log_test.c | 0
.../vmx_exception_with_invalid_guest_state.c | 0
.../vmx_invalid_nested_guest_state.c | 0
.../kvm/{x86_64 => x86}/vmx_msrs_test.c | 0
.../vmx_nested_tsc_scaling_test.c | 0
.../kvm/{x86_64 => x86}/vmx_pmu_caps_test.c | 0
.../vmx_preemption_timer_test.c | 0
.../vmx_set_nested_state_test.c | 0
.../kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c | 0
.../kvm/{x86_64 => x86}/xapic_ipi_test.c | 0
.../kvm/{x86_64 => x86}/xapic_state_test.c | 0
.../kvm/{x86_64 => x86}/xcr0_cpuid_test.c | 0
.../kvm/{x86_64 => x86}/xen_shinfo_test.c | 0
.../kvm/{x86_64 => x86}/xen_vmcall_test.c | 0
.../kvm/{x86_64 => x86}/xss_msr_test.c | 0
141 files changed, 330 insertions(+), 332 deletions(-)
create mode 100644 tools/testing/selftests/kvm/Makefile.kvm
rename tools/testing/selftests/kvm/{aarch64 => arm64}/aarch32_id_regs.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/arch_timer.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/debug-exceptions.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/get-reg-list.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/hypercalls.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/page_fault_test.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/psci_test.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/set_id_regs.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/smccc_filter.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vcpu_width_config.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_init.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_irq.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_lpi_stress.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vpmu_counter_access.c (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/arch_timer.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/delay.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3_its.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/kvm_util_arch.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/processor.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/spinlock.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/ucall.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/vgic.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/diag318_test_handler.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/kvm_util_arch.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/processor.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/ucall.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/apic.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/evmcs.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/hyperv.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/kvm_util_arch.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/mce.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/pmu.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/processor.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/sev.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm_util.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/ucall.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/vmx.h (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_private.h (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3_its.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/handlers.S (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/processor.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/spinlock.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/ucall.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/vgic.c (100%)
rename tools/testing/selftests/kvm/lib/{s390x => s390}/diag318_test_handler.c (100%)
rename tools/testing/selftests/kvm/lib/{s390x => s390}/processor.c (100%)
rename tools/testing/selftests/kvm/lib/{s390x => s390}/ucall.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/apic.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/handlers.S (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/hyperv.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/memstress.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/pmu.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/processor.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/sev.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/svm.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/ucall.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/vmx.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/cmma_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/debug_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/memop.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/resets.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/shared_zeropage_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/sync_regs_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/tprot.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/amx_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/apic_bus_clock_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/cpuid_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/debug_regs.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/dirty_log_page_splitting_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/exit_on_emulation_failure_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/fix_hypercall_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/flds_emulation.h (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/get_msr_index_features.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hwcr_msr_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_clock.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_cpuid.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_evmcs.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_extended_hypercalls.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_features.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_ipi.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_svm_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_tlb_flush.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_clock_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_pv_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/max_vcpuid_cap_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/monitor_mwait_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/nested_exceptions_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.sh (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/platform_info_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_counters_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_event_filter_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_conversions_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_kvm_exits_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/recalc_apic_map_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/set_boot_cpu_id.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/set_sregs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_init2_tests.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_migrate_tests.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_smoke_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/smaller_maxphyaddr_emulation_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/smm_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/state_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_int_ctl_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_shutdown_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_soft_inject_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_vmcall_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sync_regs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/triple_fault_event_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_msrs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_scaling_sync.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/ucna_injection_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_io_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_msr_exit_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_apic_access_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_close_while_nested_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_dirty_log_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_exception_with_invalid_guest_state.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_invalid_nested_guest_state.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_msrs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_nested_tsc_scaling_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_pmu_caps_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_preemption_timer_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_set_nested_state_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_ipi_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_state_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xcr0_cpuid_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_shinfo_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_vmcall_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xss_msr_test.c (100%)base-commit: 15e1c3d65975524c5c792fcd59f7d89f00402261
Signature · 1 line
2.46.0.295.g3b9ea8a38a-goog
Sean Christopherson
maintainerPATCH 1/3 KVM: selftests: Provide empty 'all' and 'clean' targets for unsupported ARCHs
Provide empty targets for KVM selftests if the target architecture is unsupported to make it obvious which architectures are supported, and so that various side effects don't fail and/or do weird things, e.g. as is, "mkdir -p $(sort $(dir $(TEST_GEN_PROGS)))" fails due to a missing operand, and conversely, "$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH_DIR) ..." will create an empty, useless directory for the unsupported architecture.
Move the guts of the Makefile to Makefile.kvm so that it's easier to see that the if-statement effectively guards all of KVM selftests.
--- tools/testing/selftests/kvm/Makefile | 323 +---------------------- tools/testing/selftests/kvm/Makefile.kvm | 319 ++++++++++++++++++++++ 2 files changed, 325 insertions(+), 317 deletions(-) create mode 100644 tools/testing/selftests/kvm/Makefile.kvm
tools/testing/selftests/kvm/Makefile +6 -317
@@ -1,12 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only -include ../../../build/Build.include - -all: - top_srcdir = ../../../.. include $(top_srcdir)/scripts/subarch.include ARCH ?= $(SUBARCH) +ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64)) ifeq ($(ARCH),x86) ARCH_DIR := x86_64 else ifeq ($(ARCH),arm64)
@@ -17,317 +14,9 @@ else ARCH_DIR := $(ARCH) endif -LIBKVM += lib/assert.c -LIBKVM += lib/elf.c -LIBKVM += lib/guest_modes.c -LIBKVM += lib/io.c -LIBKVM += lib/kvm_util.c -LIBKVM += lib/memstress.c -LIBKVM += lib/guest_sprintf.c -LIBKVM += lib/rbtree.c -LIBKVM += lib/sparsebit.c -LIBKVM += lib/test_util.c -LIBKVM += lib/ucall_common.c -LIBKVM += lib/userfaultfd_util.c - -LIBKVM_STRING += lib/string_override.c - -LIBKVM_x86_64 += lib/x86_64/apic.c -LIBKVM_x86_64 += lib/x86_64/handlers.S -LIBKVM_x86_64 += lib/x86_64/hyperv.c -LIBKVM_x86_64 += lib/x86_64/memstress.c -LIBKVM_x86_64 += lib/x86_64/pmu.c -LIBKVM_x86_64 += lib/x86_64/processor.c -LIBKVM_x86_64 += lib/x86_64/sev.c -LIBKVM_x86_64 += lib/x86_64/svm.c -LIBKVM_x86_64 += lib/x86_64/ucall.c -LIBKVM_x86_64 += lib/x86_64/vmx.c - -LIBKVM_aarch64 += lib/aarch64/gic.c -LIBKVM_aarch64 += lib/aarch64/gic_v3.c -LIBKVM_aarch64 += lib/aarch64/gic_v3_its.c -LIBKVM_aarch64 += lib/aarch64/handlers.S -LIBKVM_aarch64 += lib/aarch64/processor.c -LIBKVM_aarch64 += lib/aarch64/spinlock.c -LIBKVM_aarch64 += lib/aarch64/ucall.c -LIBKVM_aarch64 += lib/aarch64/vgic.c - -LIBKVM_s390x += lib/s390x/diag318_test_handler.c -LIBKVM_s390x += lib/s390x/processor.c -LIBKVM_s390x += lib/s390x/ucall.c - -LIBKVM_riscv += lib/riscv/handlers.S -LIBKVM_riscv += lib/riscv/processor.c -LIBKVM_riscv += lib/riscv/ucall.c - -# Non-compiled test targets -TEST_PROGS_x86_64 += x86_64/nx_huge_pages_test.sh - -# Compiled test targets -TEST_GEN_PROGS_x86_64 = x86_64/cpuid_test -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test -TEST_GEN_PROGS_x86_64 += x86_64/dirty_log_page_splitting_test -TEST_GEN_PROGS_x86_64 += x86_64/get_msr_index_features -TEST_GEN_PROGS_x86_64 += x86_64/exit_on_emulation_failure_test -TEST_GEN_PROGS_x86_64 += x86_64/fix_hypercall_test -TEST_GEN_PROGS_x86_64 += x86_64/hwcr_msr_test -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_clock -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_evmcs -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_extended_hypercalls -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_features -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_ipi -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_svm_test -TEST_GEN_PROGS_x86_64 += x86_64/hyperv_tlb_flush -TEST_GEN_PROGS_x86_64 += x86_64/kvm_clock_test -TEST_GEN_PROGS_x86_64 += x86_64/kvm_pv_test -TEST_GEN_PROGS_x86_64 += x86_64/monitor_mwait_test -TEST_GEN_PROGS_x86_64 += x86_64/nested_exceptions_test -TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test -TEST_GEN_PROGS_x86_64 += x86_64/pmu_counters_test -TEST_GEN_PROGS_x86_64 += x86_64/pmu_event_filter_test -TEST_GEN_PROGS_x86_64 += x86_64/private_mem_conversions_test -TEST_GEN_PROGS_x86_64 += x86_64/private_mem_kvm_exits_test -TEST_GEN_PROGS_x86_64 += x86_64/set_boot_cpu_id -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test -TEST_GEN_PROGS_x86_64 += x86_64/smaller_maxphyaddr_emulation_test -TEST_GEN_PROGS_x86_64 += x86_64/smm_test -TEST_GEN_PROGS_x86_64 += x86_64/state_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_preemption_timer_test -TEST_GEN_PROGS_x86_64 += x86_64/svm_vmcall_test -TEST_GEN_PROGS_x86_64 += x86_64/svm_int_ctl_test -TEST_GEN_PROGS_x86_64 += x86_64/svm_nested_shutdown_test -TEST_GEN_PROGS_x86_64 += x86_64/svm_nested_soft_inject_test -TEST_GEN_PROGS_x86_64 += x86_64/tsc_scaling_sync -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test -TEST_GEN_PROGS_x86_64 += x86_64/ucna_injection_test -TEST_GEN_PROGS_x86_64 += x86_64/userspace_io_test -TEST_GEN_PROGS_x86_64 += x86_64/userspace_msr_exit_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_apic_access_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_dirty_log_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_exception_with_invalid_guest_state -TEST_GEN_PROGS_x86_64 += x86_64/vmx_msrs_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_invalid_nested_guest_state -TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_nested_tsc_scaling_test -TEST_GEN_PROGS_x86_64 += x86_64/apic_bus_clock_test -TEST_GEN_PROGS_x86_64 += x86_64/xapic_ipi_test -TEST_GEN_PROGS_x86_64 += x86_64/xapic_state_test -TEST_GEN_PROGS_x86_64 += x86_64/xcr0_cpuid_test -TEST_GEN_PROGS_x86_64 += x86_64/xss_msr_test -TEST_GEN_PROGS_x86_64 += x86_64/debug_regs -TEST_GEN_PROGS_x86_64 += x86_64/tsc_msrs_test -TEST_GEN_PROGS_x86_64 += x86_64/vmx_pmu_caps_test -TEST_GEN_PROGS_x86_64 += x86_64/xen_shinfo_test -TEST_GEN_PROGS_x86_64 += x86_64/xen_vmcall_test -TEST_GEN_PROGS_x86_64 += x86_64/sev_init2_tests -TEST_GEN_PROGS_x86_64 += x86_64/sev_migrate_tests -TEST_GEN_PROGS_x86_64 += x86_64/sev_smoke_test -TEST_GEN_PROGS_x86_64 += x86_64/amx_test -TEST_GEN_PROGS_x86_64 += x86_64/max_vcpuid_cap_test -TEST_GEN_PROGS_x86_64 += x86_64/triple_fault_event_test -TEST_GEN_PROGS_x86_64 += x86_64/recalc_apic_map_test -TEST_GEN_PROGS_x86_64 += access_tracking_perf_test -TEST_GEN_PROGS_x86_64 += demand_paging_test -TEST_GEN_PROGS_x86_64 += dirty_log_test -TEST_GEN_PROGS_x86_64 += dirty_log_perf_test -TEST_GEN_PROGS_x86_64 += guest_memfd_test -TEST_GEN_PROGS_x86_64 += guest_print_test -TEST_GEN_PROGS_x86_64 += hardware_disable_test -TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus -TEST_GEN_PROGS_x86_64 += kvm_page_table_test -TEST_GEN_PROGS_x86_64 += max_guest_memory_test -TEST_GEN_PROGS_x86_64 += memslot_modification_stress_test -TEST_GEN_PROGS_x86_64 += memslot_perf_test -TEST_GEN_PROGS_x86_64 += rseq_test -TEST_GEN_PROGS_x86_64 += set_memory_region_test -TEST_GEN_PROGS_x86_64 += steal_time -TEST_GEN_PROGS_x86_64 += kvm_binary_stats_test -TEST_GEN_PROGS_x86_64 += system_counter_offset_test -TEST_GEN_PROGS_x86_64 += pre_fault_memory_test - -# Compiled outputs used by test targets -TEST_GEN_PROGS_EXTENDED_x86_64 += x86_64/nx_huge_pages_test - -TEST_GEN_PROGS_aarch64 += aarch64/aarch32_id_regs -TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions -TEST_GEN_PROGS_aarch64 += aarch64/hypercalls -TEST_GEN_PROGS_aarch64 += aarch64/page_fault_test -TEST_GEN_PROGS_aarch64 += aarch64/psci_test -TEST_GEN_PROGS_aarch64 += aarch64/set_id_regs -TEST_GEN_PROGS_aarch64 += aarch64/smccc_filter -TEST_GEN_PROGS_aarch64 += aarch64/vcpu_width_config -TEST_GEN_PROGS_aarch64 += aarch64/vgic_init -TEST_GEN_PROGS_aarch64 += aarch64/vgic_irq -TEST_GEN_PROGS_aarch64 += aarch64/vgic_lpi_stress -TEST_GEN_PROGS_aarch64 += aarch64/vpmu_counter_access -TEST_GEN_PROGS_aarch64 += access_tracking_perf_test -TEST_GEN_PROGS_aarch64 += arch_timer -TEST_GEN_PROGS_aarch64 += demand_paging_test -TEST_GEN_PROGS_aarch64 += dirty_log_test -TEST_GEN_PROGS_aarch64 += dirty_log_perf_test -TEST_GEN_PROGS_aarch64 += guest_print_test -TEST_GEN_PROGS_aarch64 += get-reg-list -TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus -TEST_GEN_PROGS_aarch64 += kvm_page_table_test -TEST_GEN_PROGS_aarch64 += memslot_modification_stress_test -TEST_GEN_PROGS_aarch64 += memslot_perf_test -TEST_GEN_PROGS_aarch64 += rseq_test -TEST_GEN_PROGS_aarch64 += set_memory_region_test -TEST_GEN_PROGS_aarch64 += steal_time -TEST_GEN_PROGS_aarch64 += kvm_binary_stats_test - -TEST_GEN_PROGS_s390x = s390x/memop -TEST_GEN_PROGS_s390x += s390x/resets -TEST_GEN_PROGS_s390x += s390x/sync_regs_test -TEST_GEN_PROGS_s390x += s390x/tprot -TEST_GEN_PROGS_s390x += s390x/cmma_test -TEST_GEN_PROGS_s390x += s390x/debug_test -TEST_GEN_PROGS_s390x += s390x/shared_zeropage_test -TEST_GEN_PROGS_s390x += demand_paging_test -TEST_GEN_PROGS_s390x += dirty_log_test -TEST_GEN_PROGS_s390x += guest_print_test -TEST_GEN_PROGS_s390x += kvm_create_max_vcpus -TEST_GEN_PROGS_s390x += kvm_page_table_test -TEST_GEN_PROGS_s390x += rseq_test -TEST_GEN_PROGS_s390x += set_memory_region_test -TEST_GEN_PROGS_s390x += kvm_binary_stats_test - -TEST_GEN_PROGS_riscv += riscv/sbi_pmu_test -TEST_GEN_PROGS_riscv += riscv/ebreak_test -TEST_GEN_PROGS_riscv += arch_timer -TEST_GEN_PROGS_riscv += demand_paging_test -TEST_GEN_PROGS_riscv += dirty_log_test -TEST_GEN_PROGS_riscv += get-reg-list -TEST_GEN_PROGS_riscv += guest_print_test -TEST_GEN_PROGS_riscv += kvm_binary_stats_test -TEST_GEN_PROGS_riscv += kvm_create_max_vcpus -TEST_GEN_PROGS_riscv += kvm_page_table_test -TEST_GEN_PROGS_riscv += set_memory_region_test -TEST_GEN_PROGS_riscv += steal_time - -SPLIT_TESTS += arch_timer -SPLIT_TESTS += get-reg-list - -TEST_PROGS += $(TEST_PROGS_$(ARCH_DIR)) -TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH_DIR)) -TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH_DIR)) -LIBKVM += $(LIBKVM_$(ARCH_DIR)) - -OVERRIDE_TARGETS = 1 - -# lib.mak defines $(OUTPUT), prepends $(OUTPUT)/ to $(TEST_GEN_PROGS), and most -# importantly defines, i.e. overwrites, $(CC) (unless `make -e` or `make CC=`, -# which causes the environment variable to override the makefile). -include ../lib.mk - -INSTALL_HDR_PATH = $(top_srcdir)/usr -LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/ -LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include -ifeq ($(ARCH),x86_64) -LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/x86/include +include Makefile.kvm else -LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include -endif -CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ - -Wno-gnu-variable-sized-type-not-at-end -MD -MP -DCONFIG_64BIT \ - -fno-builtin-memcmp -fno-builtin-memcpy \ - -fno-builtin-memset -fno-builtin-strnlen \ - -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \ - -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \ - -I$(<D) -Iinclude/$(ARCH_DIR) -I ../rseq -I.. $(EXTRA_CFLAGS) \ - $(KHDR_INCLUDES) -ifeq ($(ARCH),s390) - CFLAGS += -march=z10 -endif -ifeq ($(ARCH),arm64) -tools_dir := $(top_srcdir)/tools -arm64_tools_dir := $(tools_dir)/arch/arm64/tools/ - -ifneq ($(abs_objdir),) -arm64_hdr_outdir := $(abs_objdir)/tools/ -else -arm64_hdr_outdir := $(tools_dir)/ -endif - -GEN_HDRS := $(arm64_hdr_outdir)arch/arm64/include/generated/ -CFLAGS += -I$(GEN_HDRS) - -$(GEN_HDRS): $(wildcard $(arm64_tools_dir)/*) - $(MAKE) -C $(arm64_tools_dir) OUTPUT=$(arm64_hdr_outdir) -endif - -no-pie-option := $(call try-run, echo 'int main(void) { return 0; }' | \ - $(CC) -Werror $(CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie) - -# On s390, build the testcases KVM-enabled -pgste-option = $(call try-run, echo 'int main(void) { return 0; }' | \ - $(CC) -Werror -Wl$(comma)--s390-pgste -x c - -o "$$TMP",-Wl$(comma)--s390-pgste) - -LDLIBS += -ldl -LDFLAGS += -pthread $(no-pie-option) $(pgste-option) - -LIBKVM_C := $(filter %.c,$(LIBKVM)) -LIBKVM_S := $(filter %.S,$(LIBKVM)) -LIBKVM_C_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_C)) -LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S)) -LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING)) -LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ) -SPLIT_TEST_GEN_PROGS := $(patsubst %, $(OUTPUT)/%, $(SPLIT_TESTS)) -SPLIT_TEST_GEN_OBJ := $(patsubst %, $(OUTPUT)/$(ARCH_DIR)/%.o, $(SPLIT_TESTS)) - -TEST_GEN_OBJ = $(patsubst %, %.o, $(TEST_GEN_PROGS)) -TEST_GEN_OBJ += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED)) -TEST_DEP_FILES = $(patsubst %.o, %.d, $(TEST_GEN_OBJ)) -TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBKVM_OBJS)) -TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TEST_GEN_OBJ)) --include $(TEST_DEP_FILES) - -$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH_DIR) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ)))) - -$(filter-out $(SPLIT_TEST_GEN_PROGS), $(TEST_GEN_PROGS)) \ -$(TEST_GEN_PROGS_EXTENDED): %: %.o - $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $< $(LIBKVM_OBJS) $(LDLIBS) -o $@ -$(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ - -$(SPLIT_TEST_GEN_PROGS): $(OUTPUT)/%: $(OUTPUT)/%.o $(OUTPUT)/$(ARCH_DIR)/%.o - $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ -$(SPLIT_TEST_GEN_OBJ): $(OUTPUT)/$(ARCH_DIR)/%.o: $(ARCH_DIR)/%.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ - -EXTRA_CLEAN += $(GEN_HDRS) \ - $(LIBKVM_OBJS) \ - $(SPLIT_TEST_GEN_OBJ) \ - $(TEST_DEP_FILES) \ - $(TEST_GEN_OBJ) \ - cscope.* - -$(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c $(GEN_HDRS) - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ - -$(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S $(GEN_HDRS) - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ - -# Compile the string overrides as freestanding to prevent the compiler from -# generating self-referential code, e.g. without "freestanding" the compiler may -# "optimize" memcmp() by invoking memcmp(), thus causing infinite recursion. -$(LIBKVM_STRING_OBJ): $(OUTPUT)/%.o: %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -ffreestanding $< -o $@ - -$(shell mkdir -p $(sort $(dir $(TEST_GEN_PROGS)))) -$(SPLIT_TEST_GEN_OBJ): $(GEN_HDRS) -$(TEST_GEN_PROGS): $(LIBKVM_OBJS) -$(TEST_GEN_PROGS_EXTENDED): $(LIBKVM_OBJS) -$(TEST_GEN_OBJ): $(GEN_HDRS) - -cscope: include_paths = $(LINUX_TOOL_INCLUDE) $(LINUX_HDR_PATH) include lib .. -cscope: - $(RM) cscope.* - (find $(include_paths) -name '*.h' \ - -exec realpath --relative-base=$(PWD) {} \;; \ - find . -name '*.c' \ - -exec realpath --relative-base=$(PWD) {} \;) | sort -u > cscope.files - cscope -b +# Empty targets for unsupported architectures +all: +clean: +endif
tools/testing/selftests/kvm/Makefile.kvm new file +319 -0
319 lines not on this page · raw message
Signature · 1 line
2.46.0.295.g3b9ea8a38a-goog
Sean Christopherson
maintainerPATCH 2/3 KVM: selftests: Use canonical $(ARCH) paths for KVM selftests directories
In reply to Sean ChristophersonUse the kernel's canonical $(ARCH) paths instead of the raw target triple for KVM selftests directories. KVM selftests are quite nearly the only place in the entire kernel that using the target triple for directories, tools/testing/selftests/drivers/s390x being the lone holdout.
Using the kernel's preferred nomenclature eliminates the minor, but annoying, friction of having to translate to KVM's selftests directories, e.g. for pattern matching, opening files, running selftests, etc.
---
MAINTAINERS | 12 +-
tools/testing/selftests/kvm/Makefile | 10 +-
tools/testing/selftests/kvm/Makefile.kvm | 302 +++++++++---------
.../kvm/{aarch64 => arm64}/aarch32_id_regs.c | 0
.../kvm/{aarch64 => arm64}/arch_timer.c | 0
.../kvm/{aarch64 => arm64}/debug-exceptions.c | 0
.../kvm/{aarch64 => arm64}/get-reg-list.c | 0
.../kvm/{aarch64 => arm64}/hypercalls.c | 0
.../kvm/{aarch64 => arm64}/page_fault_test.c | 0
.../kvm/{aarch64 => arm64}/psci_test.c | 0
.../kvm/{aarch64 => arm64}/set_id_regs.c | 0
.../kvm/{aarch64 => arm64}/smccc_filter.c | 0
.../{aarch64 => arm64}/vcpu_width_config.c | 0
.../kvm/{aarch64 => arm64}/vgic_init.c | 0
.../kvm/{aarch64 => arm64}/vgic_irq.c | 0
.../kvm/{aarch64 => arm64}/vgic_lpi_stress.c | 0
.../{aarch64 => arm64}/vpmu_counter_access.c | 0
.../selftests/kvm/dirty_log_perf_test.c | 2 +-
.../include/{aarch64 => arm64}/arch_timer.h | 0
.../kvm/include/{aarch64 => arm64}/delay.h | 0
.../kvm/include/{aarch64 => arm64}/gic.h | 0
.../kvm/include/{aarch64 => arm64}/gic_v3.h | 0
.../include/{aarch64 => arm64}/gic_v3_its.h | 0
.../{aarch64 => arm64}/kvm_util_arch.h | 0
.../include/{aarch64 => arm64}/processor.h | 0
.../kvm/include/{aarch64 => arm64}/spinlock.h | 0
.../kvm/include/{aarch64 => arm64}/ucall.h | 0
.../kvm/include/{aarch64 => arm64}/vgic.h | 0
.../{s390x => s390}/diag318_test_handler.h | 0
.../include/{s390x => s390}/kvm_util_arch.h | 0
.../kvm/include/{s390x => s390}/processor.h | 0
.../kvm/include/{s390x => s390}/ucall.h | 0
.../kvm/include/{x86_64 => x86}/apic.h | 0
.../kvm/include/{x86_64 => x86}/evmcs.h | 0
.../kvm/include/{x86_64 => x86}/hyperv.h | 0
.../include/{x86_64 => x86}/kvm_util_arch.h | 0
.../kvm/include/{x86_64 => x86}/mce.h | 0
.../kvm/include/{x86_64 => x86}/pmu.h | 0
.../kvm/include/{x86_64 => x86}/processor.h | 0
.../kvm/include/{x86_64 => x86}/sev.h | 0
.../kvm/include/{x86_64 => x86}/svm.h | 0
.../kvm/include/{x86_64 => x86}/svm_util.h | 0
.../kvm/include/{x86_64 => x86}/ucall.h | 0
.../kvm/include/{x86_64 => x86}/vmx.h | 0
.../kvm/lib/{aarch64 => arm64}/gic.c | 0
.../kvm/lib/{aarch64 => arm64}/gic_private.h | 0
.../kvm/lib/{aarch64 => arm64}/gic_v3.c | 0
.../kvm/lib/{aarch64 => arm64}/gic_v3_its.c | 0
.../kvm/lib/{aarch64 => arm64}/handlers.S | 0
.../kvm/lib/{aarch64 => arm64}/processor.c | 0
.../kvm/lib/{aarch64 => arm64}/spinlock.c | 0
.../kvm/lib/{aarch64 => arm64}/ucall.c | 0
.../kvm/lib/{aarch64 => arm64}/vgic.c | 0
.../{s390x => s390}/diag318_test_handler.c | 0
.../kvm/lib/{s390x => s390}/processor.c | 0
.../selftests/kvm/lib/{s390x => s390}/ucall.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/apic.c | 0
.../kvm/lib/{x86_64 => x86}/handlers.S | 0
.../kvm/lib/{x86_64 => x86}/hyperv.c | 0
.../kvm/lib/{x86_64 => x86}/memstress.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/pmu.c | 0
.../kvm/lib/{x86_64 => x86}/processor.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/sev.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/svm.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/ucall.c | 0
.../selftests/kvm/lib/{x86_64 => x86}/vmx.c | 0
.../selftests/kvm/{s390x => s390}/cmma_test.c | 0
.../kvm/{s390x => s390}/debug_test.c | 0
.../selftests/kvm/{s390x => s390}/memop.c | 0
.../selftests/kvm/{s390x => s390}/resets.c | 0
.../{s390x => s390}/shared_zeropage_test.c | 0
.../kvm/{s390x => s390}/sync_regs_test.c | 0
.../selftests/kvm/{s390x => s390}/tprot.c | 0
.../selftests/kvm/{x86_64 => x86}/amx_test.c | 0
.../kvm/{x86_64 => x86}/apic_bus_clock_test.c | 0
.../kvm/{x86_64 => x86}/cpuid_test.c | 0
.../kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c | 0
.../kvm/{x86_64 => x86}/debug_regs.c | 0
.../dirty_log_page_splitting_test.c | 0
.../exit_on_emulation_failure_test.c | 0
.../kvm/{x86_64 => x86}/fix_hypercall_test.c | 0
.../kvm/{x86_64 => x86}/flds_emulation.h | 0
.../{x86_64 => x86}/get_msr_index_features.c | 0
.../kvm/{x86_64 => x86}/hwcr_msr_test.c | 0
.../kvm/{x86_64 => x86}/hyperv_clock.c | 0
.../kvm/{x86_64 => x86}/hyperv_cpuid.c | 0
.../kvm/{x86_64 => x86}/hyperv_evmcs.c | 0
.../hyperv_extended_hypercalls.c | 0
.../kvm/{x86_64 => x86}/hyperv_features.c | 0
.../kvm/{x86_64 => x86}/hyperv_ipi.c | 0
.../kvm/{x86_64 => x86}/hyperv_svm_test.c | 0
.../kvm/{x86_64 => x86}/hyperv_tlb_flush.c | 0
.../kvm/{x86_64 => x86}/kvm_clock_test.c | 0
.../kvm/{x86_64 => x86}/kvm_pv_test.c | 0
.../kvm/{x86_64 => x86}/max_vcpuid_cap_test.c | 0
.../kvm/{x86_64 => x86}/monitor_mwait_test.c | 0
.../{x86_64 => x86}/nested_exceptions_test.c | 0
.../kvm/{x86_64 => x86}/nx_huge_pages_test.c | 0
.../kvm/{x86_64 => x86}/nx_huge_pages_test.sh | 0
.../kvm/{x86_64 => x86}/platform_info_test.c | 0
.../kvm/{x86_64 => x86}/pmu_counters_test.c | 0
.../{x86_64 => x86}/pmu_event_filter_test.c | 0
.../private_mem_conversions_test.c | 0
.../private_mem_kvm_exits_test.c | 0
.../{x86_64 => x86}/recalc_apic_map_test.c | 0
.../kvm/{x86_64 => x86}/set_boot_cpu_id.c | 0
.../kvm/{x86_64 => x86}/set_sregs_test.c | 0
.../kvm/{x86_64 => x86}/sev_init2_tests.c | 0
.../kvm/{x86_64 => x86}/sev_migrate_tests.c | 0
.../kvm/{x86_64 => x86}/sev_smoke_test.c | 0
.../smaller_maxphyaddr_emulation_test.c | 0
.../selftests/kvm/{x86_64 => x86}/smm_test.c | 0
.../kvm/{x86_64 => x86}/state_test.c | 0
.../kvm/{x86_64 => x86}/svm_int_ctl_test.c | 0
.../svm_nested_shutdown_test.c | 0
.../svm_nested_soft_inject_test.c | 0
.../kvm/{x86_64 => x86}/svm_vmcall_test.c | 0
.../kvm/{x86_64 => x86}/sync_regs_test.c | 0
.../{x86_64 => x86}/triple_fault_event_test.c | 0
.../kvm/{x86_64 => x86}/tsc_msrs_test.c | 0
.../kvm/{x86_64 => x86}/tsc_scaling_sync.c | 0
.../kvm/{x86_64 => x86}/ucna_injection_test.c | 0
.../kvm/{x86_64 => x86}/userspace_io_test.c | 0
.../{x86_64 => x86}/userspace_msr_exit_test.c | 0
.../{x86_64 => x86}/vmx_apic_access_test.c | 0
.../vmx_close_while_nested_test.c | 0
.../kvm/{x86_64 => x86}/vmx_dirty_log_test.c | 0
.../vmx_exception_with_invalid_guest_state.c | 0
.../vmx_invalid_nested_guest_state.c | 0
.../kvm/{x86_64 => x86}/vmx_msrs_test.c | 0
.../vmx_nested_tsc_scaling_test.c | 0
.../kvm/{x86_64 => x86}/vmx_pmu_caps_test.c | 0
.../vmx_preemption_timer_test.c | 0
.../vmx_set_nested_state_test.c | 0
.../kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c | 0
.../kvm/{x86_64 => x86}/xapic_ipi_test.c | 0
.../kvm/{x86_64 => x86}/xapic_state_test.c | 0
.../kvm/{x86_64 => x86}/xcr0_cpuid_test.c | 0
.../kvm/{x86_64 => x86}/xen_shinfo_test.c | 0
.../kvm/{x86_64 => x86}/xen_vmcall_test.c | 0
.../kvm/{x86_64 => x86}/xss_msr_test.c | 0
141 files changed, 159 insertions(+), 167 deletions(-)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/aarch32_id_regs.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/arch_timer.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/debug-exceptions.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/get-reg-list.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/hypercalls.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/page_fault_test.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/psci_test.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/set_id_regs.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/smccc_filter.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vcpu_width_config.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_init.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_irq.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_lpi_stress.c (100%)
rename tools/testing/selftests/kvm/{aarch64 => arm64}/vpmu_counter_access.c (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/arch_timer.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/delay.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3_its.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/kvm_util_arch.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/processor.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/spinlock.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/ucall.h (100%)
rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/vgic.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/diag318_test_handler.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/kvm_util_arch.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/processor.h (100%)
rename tools/testing/selftests/kvm/include/{s390x => s390}/ucall.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/apic.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/evmcs.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/hyperv.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/kvm_util_arch.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/mce.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/pmu.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/processor.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/sev.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm_util.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/ucall.h (100%)
rename tools/testing/selftests/kvm/include/{x86_64 => x86}/vmx.h (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_private.h (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3_its.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/handlers.S (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/processor.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/spinlock.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/ucall.c (100%)
rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/vgic.c (100%)
rename tools/testing/selftests/kvm/lib/{s390x => s390}/diag318_test_handler.c (100%)
rename tools/testing/selftests/kvm/lib/{s390x => s390}/processor.c (100%)
rename tools/testing/selftests/kvm/lib/{s390x => s390}/ucall.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/apic.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/handlers.S (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/hyperv.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/memstress.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/pmu.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/processor.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/sev.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/svm.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/ucall.c (100%)
rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/vmx.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/cmma_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/debug_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/memop.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/resets.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/shared_zeropage_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/sync_regs_test.c (100%)
rename tools/testing/selftests/kvm/{s390x => s390}/tprot.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/amx_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/apic_bus_clock_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/cpuid_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/debug_regs.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/dirty_log_page_splitting_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/exit_on_emulation_failure_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/fix_hypercall_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/flds_emulation.h (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/get_msr_index_features.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hwcr_msr_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_clock.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_cpuid.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_evmcs.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_extended_hypercalls.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_features.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_ipi.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_svm_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_tlb_flush.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_clock_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_pv_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/max_vcpuid_cap_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/monitor_mwait_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/nested_exceptions_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.sh (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/platform_info_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_counters_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_event_filter_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_conversions_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_kvm_exits_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/recalc_apic_map_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/set_boot_cpu_id.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/set_sregs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_init2_tests.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_migrate_tests.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_smoke_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/smaller_maxphyaddr_emulation_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/smm_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/state_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_int_ctl_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_shutdown_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_soft_inject_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_vmcall_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/sync_regs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/triple_fault_event_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_msrs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_scaling_sync.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/ucna_injection_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_io_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_msr_exit_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_apic_access_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_close_while_nested_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_dirty_log_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_exception_with_invalid_guest_state.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_invalid_nested_guest_state.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_msrs_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_nested_tsc_scaling_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_pmu_caps_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_preemption_timer_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_set_nested_state_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_ipi_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_state_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xcr0_cpuid_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_shinfo_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_vmcall_test.c (100%)
rename tools/testing/selftests/kvm/{x86_64 => x86}/xss_msr_test.c (100%)MAINTAINERS +6 -6
@@ -12281,8 +12281,8 @@ F: arch/arm64/include/asm/kvm* F: arch/arm64/include/uapi/asm/kvm* F: arch/arm64/kvm/ F: include/kvm/arm_* -F: tools/testing/selftests/kvm/*/aarch64/ -F: tools/testing/selftests/kvm/aarch64/ +F: tools/testing/selftests/kvm/*/arm64/ +F: tools/testing/selftests/kvm/arm64/ KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch) M: Tianrui Zhao <[email protected]>
@@ -12352,8 +12352,8 @@ F: arch/s390/kvm/ F: arch/s390/mm/gmap.c F: drivers/s390/char/uvdevice.c F: tools/testing/selftests/drivers/s390x/uvdevice/ -F: tools/testing/selftests/kvm/*/s390x/ -F: tools/testing/selftests/kvm/s390x/ +F: tools/testing/selftests/kvm/*/s390/ +F: tools/testing/selftests/kvm/s390/ KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86) M: Sean Christopherson <[email protected]>
@@ -12370,8 +12370,8 @@ F: arch/x86/include/uapi/asm/svm.h F: arch/x86/include/uapi/asm/vmx.h F: arch/x86/kvm/ F: arch/x86/kvm/*/ -F: tools/testing/selftests/kvm/*/x86_64/ -F: tools/testing/selftests/kvm/x86_64/ +F: tools/testing/selftests/kvm/*/x86/ +F: tools/testing/selftests/kvm/x86/ KERNFS M: Greg Kroah-Hartman <[email protected]>
tools/testing/selftests/kvm/Makefile +3 -7
@@ -4,16 +4,12 @@ include $(top_srcdir)/scripts/subarch.include ARCH ?= $(SUBARCH) ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64)) -ifeq ($(ARCH),x86) - ARCH_DIR := x86_64 -else ifeq ($(ARCH),arm64) - ARCH_DIR := aarch64 -else ifeq ($(ARCH),s390) - ARCH_DIR := s390x +# Top-level selftests allows ARCH=x86_64 :-( +ifeq ($(ARCH),x86_64) + ARCH_DIR := x86 else ARCH_DIR := $(ARCH) endif - include Makefile.kvm else # Empty targets for unsupported architectures
tools/testing/selftests/kvm/Makefile.kvm +149 -153
328 lines not on this page · raw message
tools/testing/selftests/kvm/arm64/aarch32_id_regs.c renamed from tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c +0 -0
tools/testing/selftests/kvm/arm64/arch_timer.c renamed from tools/testing/selftests/kvm/aarch64/arch_timer.c +0 -0
tools/testing/selftests/kvm/arm64/debug-exceptions.c renamed from tools/testing/selftests/kvm/aarch64/debug-exceptions.c +0 -0
tools/testing/selftests/kvm/arm64/get-reg-list.c renamed from tools/testing/selftests/kvm/aarch64/get-reg-list.c +0 -0
tools/testing/selftests/kvm/arm64/hypercalls.c renamed from tools/testing/selftests/kvm/aarch64/hypercalls.c +0 -0
tools/testing/selftests/kvm/arm64/page_fault_test.c renamed from tools/testing/selftests/kvm/aarch64/page_fault_test.c +0 -0
tools/testing/selftests/kvm/arm64/psci_test.c renamed from tools/testing/selftests/kvm/aarch64/psci_test.c +0 -0
tools/testing/selftests/kvm/arm64/set_id_regs.c renamed from tools/testing/selftests/kvm/aarch64/set_id_regs.c +0 -0
tools/testing/selftests/kvm/arm64/smccc_filter.c renamed from tools/testing/selftests/kvm/aarch64/smccc_filter.c +0 -0
tools/testing/selftests/kvm/arm64/vcpu_width_config.c renamed from tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +0 -0
tools/testing/selftests/kvm/arm64/vgic_init.c renamed from tools/testing/selftests/kvm/aarch64/vgic_init.c +0 -0
tools/testing/selftests/kvm/arm64/vgic_irq.c renamed from tools/testing/selftests/kvm/aarch64/vgic_irq.c +0 -0
tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c renamed from tools/testing/selftests/kvm/aarch64/vgic_lpi_stress.c +0 -0
tools/testing/selftests/kvm/arm64/vpmu_counter_access.c renamed from tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c +0 -0
tools/testing/selftests/kvm/dirty_log_perf_test.c +1 -1
@@ -21,7 +21,7 @@#include "ucall_common.h" #ifdef __aarch64__ -#include "aarch64/vgic.h" +#include "arm64/vgic.h" static int gic_fd;
tools/testing/selftests/kvm/include/arm64/arch_timer.h renamed from tools/testing/selftests/kvm/include/aarch64/arch_timer.h +0 -0
tools/testing/selftests/kvm/include/arm64/delay.h renamed from tools/testing/selftests/kvm/include/aarch64/delay.h +0 -0
tools/testing/selftests/kvm/include/arm64/gic.h renamed from tools/testing/selftests/kvm/include/aarch64/gic.h +0 -0
tools/testing/selftests/kvm/include/arm64/gic_v3.h renamed from tools/testing/selftests/kvm/include/aarch64/gic_v3.h +0 -0
tools/testing/selftests/kvm/include/arm64/gic_v3_its.h renamed from tools/testing/selftests/kvm/include/aarch64/gic_v3_its.h +0 -0
tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h renamed from tools/testing/selftests/kvm/include/aarch64/kvm_util_arch.h +0 -0
tools/testing/selftests/kvm/include/arm64/processor.h renamed from tools/testing/selftests/kvm/include/aarch64/processor.h +0 -0
tools/testing/selftests/kvm/include/arm64/spinlock.h renamed from tools/testing/selftests/kvm/include/aarch64/spinlock.h +0 -0
tools/testing/selftests/kvm/include/arm64/ucall.h renamed from tools/testing/selftests/kvm/include/aarch64/ucall.h +0 -0
tools/testing/selftests/kvm/include/arm64/vgic.h renamed from tools/testing/selftests/kvm/include/aarch64/vgic.h +0 -0
tools/testing/selftests/kvm/include/s390/diag318_test_handler.h renamed from tools/testing/selftests/kvm/include/s390x/diag318_test_handler.h +0 -0
tools/testing/selftests/kvm/include/s390/kvm_util_arch.h renamed from tools/testing/selftests/kvm/include/s390x/kvm_util_arch.h +0 -0
tools/testing/selftests/kvm/include/s390/processor.h renamed from tools/testing/selftests/kvm/include/s390x/processor.h +0 -0
tools/testing/selftests/kvm/include/s390/ucall.h renamed from tools/testing/selftests/kvm/include/s390x/ucall.h +0 -0
tools/testing/selftests/kvm/include/x86/apic.h renamed from tools/testing/selftests/kvm/include/x86_64/apic.h +0 -0
tools/testing/selftests/kvm/include/x86/evmcs.h renamed from tools/testing/selftests/kvm/include/x86_64/evmcs.h +0 -0
tools/testing/selftests/kvm/include/x86/hyperv.h renamed from tools/testing/selftests/kvm/include/x86_64/hyperv.h +0 -0
tools/testing/selftests/kvm/include/x86/kvm_util_arch.h renamed from tools/testing/selftests/kvm/include/x86_64/kvm_util_arch.h +0 -0
tools/testing/selftests/kvm/include/x86/mce.h renamed from tools/testing/selftests/kvm/include/x86_64/mce.h +0 -0
tools/testing/selftests/kvm/include/x86/pmu.h renamed from tools/testing/selftests/kvm/include/x86_64/pmu.h +0 -0
tools/testing/selftests/kvm/include/x86/processor.h renamed from tools/testing/selftests/kvm/include/x86_64/processor.h +0 -0
tools/testing/selftests/kvm/include/x86/sev.h renamed from tools/testing/selftests/kvm/include/x86_64/sev.h +0 -0
tools/testing/selftests/kvm/include/x86/svm.h renamed from tools/testing/selftests/kvm/include/x86_64/svm.h +0 -0
tools/testing/selftests/kvm/include/x86/svm_util.h renamed from tools/testing/selftests/kvm/include/x86_64/svm_util.h +0 -0
tools/testing/selftests/kvm/include/x86/ucall.h renamed from tools/testing/selftests/kvm/include/x86_64/ucall.h +0 -0
tools/testing/selftests/kvm/include/x86/vmx.h renamed from tools/testing/selftests/kvm/include/x86_64/vmx.h +0 -0
tools/testing/selftests/kvm/lib/arm64/gic.c renamed from tools/testing/selftests/kvm/lib/aarch64/gic.c +0 -0
tools/testing/selftests/kvm/lib/arm64/gic_private.h renamed from tools/testing/selftests/kvm/lib/aarch64/gic_private.h +0 -0
tools/testing/selftests/kvm/lib/arm64/gic_v3.c renamed from tools/testing/selftests/kvm/lib/aarch64/gic_v3.c +0 -0
tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c renamed from tools/testing/selftests/kvm/lib/aarch64/gic_v3_its.c +0 -0
tools/testing/selftests/kvm/lib/arm64/handlers.S renamed from tools/testing/selftests/kvm/lib/aarch64/handlers.S +0 -0
tools/testing/selftests/kvm/lib/arm64/processor.c renamed from tools/testing/selftests/kvm/lib/aarch64/processor.c +0 -0
tools/testing/selftests/kvm/lib/arm64/spinlock.c renamed from tools/testing/selftests/kvm/lib/aarch64/spinlock.c +0 -0
tools/testing/selftests/kvm/lib/arm64/ucall.c renamed from tools/testing/selftests/kvm/lib/aarch64/ucall.c +0 -0
tools/testing/selftests/kvm/lib/arm64/vgic.c renamed from tools/testing/selftests/kvm/lib/aarch64/vgic.c +0 -0
tools/testing/selftests/kvm/lib/s390/diag318_test_handler.c renamed from tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +0 -0
tools/testing/selftests/kvm/lib/s390/processor.c renamed from tools/testing/selftests/kvm/lib/s390x/processor.c +0 -0
tools/testing/selftests/kvm/lib/s390/ucall.c renamed from tools/testing/selftests/kvm/lib/s390x/ucall.c +0 -0
tools/testing/selftests/kvm/lib/x86/apic.c renamed from tools/testing/selftests/kvm/lib/x86_64/apic.c +0 -0
tools/testing/selftests/kvm/lib/x86/handlers.S renamed from tools/testing/selftests/kvm/lib/x86_64/handlers.S +0 -0
tools/testing/selftests/kvm/lib/x86/hyperv.c renamed from tools/testing/selftests/kvm/lib/x86_64/hyperv.c +0 -0
tools/testing/selftests/kvm/lib/x86/memstress.c renamed from tools/testing/selftests/kvm/lib/x86_64/memstress.c +0 -0
tools/testing/selftests/kvm/lib/x86/pmu.c renamed from tools/testing/selftests/kvm/lib/x86_64/pmu.c +0 -0
tools/testing/selftests/kvm/lib/x86/processor.c renamed from tools/testing/selftests/kvm/lib/x86_64/processor.c +0 -0
tools/testing/selftests/kvm/lib/x86/sev.c renamed from tools/testing/selftests/kvm/lib/x86_64/sev.c +0 -0
tools/testing/selftests/kvm/lib/x86/svm.c renamed from tools/testing/selftests/kvm/lib/x86_64/svm.c +0 -0
tools/testing/selftests/kvm/lib/x86/ucall.c renamed from tools/testing/selftests/kvm/lib/x86_64/ucall.c +0 -0
tools/testing/selftests/kvm/lib/x86/vmx.c renamed from tools/testing/selftests/kvm/lib/x86_64/vmx.c +0 -0
tools/testing/selftests/kvm/s390/cmma_test.c renamed from tools/testing/selftests/kvm/s390x/cmma_test.c +0 -0
tools/testing/selftests/kvm/s390/debug_test.c renamed from tools/testing/selftests/kvm/s390x/debug_test.c +0 -0
tools/testing/selftests/kvm/s390/memop.c renamed from tools/testing/selftests/kvm/s390x/memop.c +0 -0
tools/testing/selftests/kvm/s390/resets.c renamed from tools/testing/selftests/kvm/s390x/resets.c +0 -0
tools/testing/selftests/kvm/s390/shared_zeropage_test.c renamed from tools/testing/selftests/kvm/s390x/shared_zeropage_test.c +0 -0
tools/testing/selftests/kvm/s390/sync_regs_test.c renamed from tools/testing/selftests/kvm/s390x/sync_regs_test.c +0 -0
tools/testing/selftests/kvm/s390/tprot.c renamed from tools/testing/selftests/kvm/s390x/tprot.c +0 -0
tools/testing/selftests/kvm/x86/amx_test.c renamed from tools/testing/selftests/kvm/x86_64/amx_test.c +0 -0
tools/testing/selftests/kvm/x86/apic_bus_clock_test.c renamed from tools/testing/selftests/kvm/x86_64/apic_bus_clock_test.c +0 -0
tools/testing/selftests/kvm/x86/cpuid_test.c renamed from tools/testing/selftests/kvm/x86_64/cpuid_test.c +0 -0
tools/testing/selftests/kvm/x86/cr4_cpuid_sync_test.c renamed from tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +0 -0
tools/testing/selftests/kvm/x86/debug_regs.c renamed from tools/testing/selftests/kvm/x86_64/debug_regs.c +0 -0
tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c renamed from tools/testing/selftests/kvm/x86_64/dirty_log_page_splitting_test.c +0 -0
tools/testing/selftests/kvm/x86/exit_on_emulation_failure_test.c renamed from tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c +0 -0
tools/testing/selftests/kvm/x86/fix_hypercall_test.c renamed from tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +0 -0
tools/testing/selftests/kvm/x86/flds_emulation.h renamed from tools/testing/selftests/kvm/x86_64/flds_emulation.h +0 -0
tools/testing/selftests/kvm/x86/get_msr_index_features.c renamed from tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +0 -0
tools/testing/selftests/kvm/x86/hwcr_msr_test.c renamed from tools/testing/selftests/kvm/x86_64/hwcr_msr_test.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_clock.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_clock.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_cpuid.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_evmcs.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_extended_hypercalls.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_features.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_features.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_ipi.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_ipi.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_svm_test.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +0 -0
tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c renamed from tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c +0 -0
tools/testing/selftests/kvm/x86/kvm_clock_test.c renamed from tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +0 -0
tools/testing/selftests/kvm/x86/kvm_pv_test.c renamed from tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +0 -0
tools/testing/selftests/kvm/x86/max_vcpuid_cap_test.c renamed from tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c +0 -0
tools/testing/selftests/kvm/x86/monitor_mwait_test.c renamed from tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +0 -0
tools/testing/selftests/kvm/x86/nested_exceptions_test.c renamed from tools/testing/selftests/kvm/x86_64/nested_exceptions_test.c +0 -0
tools/testing/selftests/kvm/x86/nx_huge_pages_test.c renamed from tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c +0 -0
tools/testing/selftests/kvm/x86/nx_huge_pages_test.sh renamed from tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.sh +0 -0
tools/testing/selftests/kvm/x86/platform_info_test.c renamed from tools/testing/selftests/kvm/x86_64/platform_info_test.c +0 -0
tools/testing/selftests/kvm/x86/pmu_counters_test.c renamed from tools/testing/selftests/kvm/x86_64/pmu_counters_test.c +0 -0
tools/testing/selftests/kvm/x86/pmu_event_filter_test.c renamed from tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +0 -0
tools/testing/selftests/kvm/x86/private_mem_conversions_test.c renamed from tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c +0 -0
tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c renamed from tools/testing/selftests/kvm/x86_64/private_mem_kvm_exits_test.c +0 -0
tools/testing/selftests/kvm/x86/recalc_apic_map_test.c renamed from tools/testing/selftests/kvm/x86_64/recalc_apic_map_test.c +0 -0
tools/testing/selftests/kvm/x86/set_boot_cpu_id.c renamed from tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +0 -0
tools/testing/selftests/kvm/x86/set_sregs_test.c renamed from tools/testing/selftests/kvm/x86_64/set_sregs_test.c +0 -0
tools/testing/selftests/kvm/x86/sev_init2_tests.c renamed from tools/testing/selftests/kvm/x86_64/sev_init2_tests.c +0 -0
tools/testing/selftests/kvm/x86/sev_migrate_tests.c renamed from tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +0 -0
tools/testing/selftests/kvm/x86/sev_smoke_test.c renamed from tools/testing/selftests/kvm/x86_64/sev_smoke_test.c +0 -0
tools/testing/selftests/kvm/x86/smaller_maxphyaddr_emulation_test.c renamed from tools/testing/selftests/kvm/x86_64/smaller_maxphyaddr_emulation_test.c +0 -0
tools/testing/selftests/kvm/x86/smm_test.c renamed from tools/testing/selftests/kvm/x86_64/smm_test.c +0 -0
tools/testing/selftests/kvm/x86/state_test.c renamed from tools/testing/selftests/kvm/x86_64/state_test.c +0 -0
tools/testing/selftests/kvm/x86/svm_int_ctl_test.c renamed from tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c +0 -0
tools/testing/selftests/kvm/x86/svm_nested_shutdown_test.c renamed from tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c +0 -0
tools/testing/selftests/kvm/x86/svm_nested_soft_inject_test.c renamed from tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +0 -0
tools/testing/selftests/kvm/x86/svm_vmcall_test.c renamed from tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c +0 -0
tools/testing/selftests/kvm/x86/sync_regs_test.c renamed from tools/testing/selftests/kvm/x86_64/sync_regs_test.c +0 -0
tools/testing/selftests/kvm/x86/triple_fault_event_test.c renamed from tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +0 -0
tools/testing/selftests/kvm/x86/tsc_msrs_test.c renamed from tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c +0 -0
tools/testing/selftests/kvm/x86/tsc_scaling_sync.c renamed from tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +0 -0
tools/testing/selftests/kvm/x86/ucna_injection_test.c renamed from tools/testing/selftests/kvm/x86_64/ucna_injection_test.c +0 -0
tools/testing/selftests/kvm/x86/userspace_io_test.c renamed from tools/testing/selftests/kvm/x86_64/userspace_io_test.c +0 -0
tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c renamed from tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_apic_access_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_close_while_nested_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c renamed from tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +0 -0
tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c renamed from tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c +0 -0
tools/testing/selftests/kvm/x86/vmx_msrs_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_msrs_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_nested_tsc_scaling_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_set_nested_state_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +0 -0
tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c renamed from tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +0 -0
tools/testing/selftests/kvm/x86/xapic_ipi_test.c renamed from tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +0 -0
tools/testing/selftests/kvm/x86/xapic_state_test.c renamed from tools/testing/selftests/kvm/x86_64/xapic_state_test.c +0 -0
tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c renamed from tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c +0 -0
tools/testing/selftests/kvm/x86/xen_shinfo_test.c renamed from tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +0 -0
tools/testing/selftests/kvm/x86/xen_vmcall_test.c renamed from tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +0 -0
tools/testing/selftests/kvm/x86/xss_msr_test.c renamed from tools/testing/selftests/kvm/x86_64/xss_msr_test.c +0 -0
Signature · 1 line
2.46.0.295.g3b9ea8a38a-goog
Sean Christopherson
maintainerPATCH 3/3 KVM: selftests: Override ARCH for x86_64 instead of using ARCH_DIR
In reply to Sean ChristophersonNow that KVM selftests uses the kernel's canonical arch paths, directly override ARCH to 'x86' when targeting x86_64 instead of defining ARCH_DIR to redirect to appropriate paths. ARCH_DIR was originally added to deal with KVM selftests using the target triple ARCH for directories, e.g. s390x and aarch64; keeping it around just to deal with the one-off alias from x86_64=>x86 is unnecessary and confusing.
Note, even when selftests are built from the top-level Makefile, ARCH is scoped to KVM's makefiles, i.e. overriding ARCH won't trip up some other selftests that (somehow) expects x86_64 and can't work with x86.
--- tools/testing/selftests/kvm/Makefile | 4 +--- tools/testing/selftests/kvm/Makefile.kvm | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/Makefile +1 -3
@@ -6,9 +6,7 @@ ARCH ?= $(SUBARCH) ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64)) # Top-level selftests allows ARCH=x86_64 :-( ifeq ($(ARCH),x86_64) - ARCH_DIR := x86 -else - ARCH_DIR := $(ARCH) + ARCH := x86 endif include Makefile.kvm else
tools/testing/selftests/kvm/Makefile.kvm +10 -10
@@ -197,10 +197,10 @@ TEST_GEN_PROGS_riscv += steal_time SPLIT_TESTS += arch_timer SPLIT_TESTS += get-reg-list -TEST_PROGS += $(TEST_PROGS_$(ARCH_DIR)) -TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH_DIR)) -TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH_DIR)) -LIBKVM += $(LIBKVM_$(ARCH_DIR)) +TEST_PROGS += $(TEST_PROGS_$(ARCH)) +TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH)) +TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH)) +LIBKVM += $(LIBKVM_$(ARCH)) OVERRIDE_TARGETS = 1
@@ -212,14 +212,14 @@ include ../lib.mk INSTALL_HDR_PATH = $(top_srcdir)/usr LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/ LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include -LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH_DIR)/include +LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ -Wno-gnu-variable-sized-type-not-at-end -MD -MP -DCONFIG_64BIT \ -fno-builtin-memcmp -fno-builtin-memcpy \ -fno-builtin-memset -fno-builtin-strnlen \ -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \ -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \ - -I$(<D) -Iinclude/$(ARCH_DIR) -I ../rseq -I.. $(EXTRA_CFLAGS) \ + -I$(<D) -Iinclude/$(ARCH) -I ../rseq -I.. $(EXTRA_CFLAGS) \ $(KHDR_INCLUDES) ifeq ($(ARCH),s390) CFLAGS += -march=z10
@@ -258,7 +258,7 @@ LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S)) LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING)) LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ) SPLIT_TEST_GEN_PROGS := $(patsubst %, $(OUTPUT)/%, $(SPLIT_TESTS)) -SPLIT_TEST_GEN_OBJ := $(patsubst %, $(OUTPUT)/$(ARCH_DIR)/%.o, $(SPLIT_TESTS)) +SPLIT_TEST_GEN_OBJ := $(patsubst %, $(OUTPUT)/$(ARCH)/%.o, $(SPLIT_TESTS)) TEST_GEN_OBJ = $(patsubst %, %.o, $(TEST_GEN_PROGS)) TEST_GEN_OBJ += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED))
@@ -267,7 +267,7 @@ TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBKVM_OBJS)) TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TEST_GEN_OBJ)) -include $(TEST_DEP_FILES) -$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH_DIR) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ)))) +$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ)))) $(filter-out $(SPLIT_TEST_GEN_PROGS), $(TEST_GEN_PROGS)) \ $(TEST_GEN_PROGS_EXTENDED): %: %.o
@@ -275,9 +275,9 @@ $(TEST_GEN_PROGS_EXTENDED): %: %.o $(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ -$(SPLIT_TEST_GEN_PROGS): $(OUTPUT)/%: $(OUTPUT)/%.o $(OUTPUT)/$(ARCH_DIR)/%.o +$(SPLIT_TEST_GEN_PROGS): $(OUTPUT)/%: $(OUTPUT)/%.o $(OUTPUT)/$(ARCH)/%.o $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ -$(SPLIT_TEST_GEN_OBJ): $(OUTPUT)/$(ARCH_DIR)/%.o: $(ARCH_DIR)/%.c +$(SPLIT_TEST_GEN_OBJ): $(OUTPUT)/$(ARCH)/%.o: $(ARCH)/%.c $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ EXTRA_CLEAN += $(GEN_HDRS) \
Signature · 1 line
2.46.0.295.g3b9ea8a38a-goog