@@ -58,55 +58,55 @@ smp = 3
[vmexit_cpuid]
file = vmexit.flat
-extra_params = -append 'cpuid'
+extra_params = -append '+cpuid'
groups = vmexit
[vmexit_vmcall]
file = vmexit.flat
-extra_params = -append 'vmcall'
+extra_params = -append '+vmcall'
groups = vmexit
[vmexit_mov_from_cr8]
file = vmexit.flat
-extra_params = -append 'mov_from_cr8'
+extra_params = -append '+mov_from_cr8'
groups = vmexit
[vmexit_mov_to_cr8]
file = vmexit.flat
-extra_params = -append 'mov_to_cr8'
+extra_params = -append '+mov_to_cr8'
groups = vmexit
[vmexit_inl_pmtimer]
file = vmexit.flat
-extra_params = -append 'inl_from_pmtimer'
+extra_params = -append '+inl_from_pmtimer'
groups = vmexit
[vmexit_ipi]
file = vmexit.flat
smp = 2
-extra_params = -append 'ipi'
+extra_params = -append '+ipi'
groups = vmexit
[vmexit_ipi_halt]
file = vmexit.flat
smp = 2
-extra_params = -append 'ipi_halt'
+extra_params = -append '+ipi_halt'
groups = vmexit
[vmexit_ple_round_robin]
file = vmexit.flat
-extra_params = -append 'ple_round_robin'
+extra_params = -append '+ple_round_robin'
groups = vmexit
[vmexit_tscdeadline]
file = vmexit.flat
groups = vmexit
-extra_params = -cpu qemu64,+x2apic,+tsc-deadline -append tscdeadline
+extra_params = -cpu qemu64,+x2apic,+tsc-deadline -append '+tscdeadline'
[vmexit_tscdeadline_immed]
file = vmexit.flat
groups = vmexit
-extra_params = -cpu qemu64,+x2apic,+tsc-deadline -append tscdeadline_immed
+extra_params = -cpu qemu64,+x2apic,+tsc-deadline -append '+tscdeadline_immed'
[access]
file = access.flat
@@ -233,27 +233,27 @@ groups = vmx
[ept]
file = vmx.flat
-extra_params = -cpu host,host-phys-bits,+vmx -m 2560 -append "ept_access*"
+extra_params = -cpu host,host-phys-bits,+vmx -m 2560 -append "+ept_access*"
arch = x86_64
groups = vmx
[vmx_eoi_bitmap_ioapic_scan]
file = vmx.flat
smp = 2
-extra_params = -cpu host,+vmx -m 2048 -append vmx_eoi_bitmap_ioapic_scan_test
+extra_params = -cpu host,+vmx -m 2048 -append '+vmx_eoi_bitmap_ioapic_scan_test'
arch = x86_64
groups = vmx
[vmx_hlt_with_rvi_test]
file = vmx.flat
-extra_params = -cpu host,+vmx -append vmx_hlt_with_rvi_test
+extra_params = -cpu host,+vmx -append '+vmx_hlt_with_rvi_test'
arch = x86_64
groups = vmx
timeout = 10
[vmx_apicv_test]
file = vmx.flat
-extra_params = -cpu host,+vmx -append "apic_reg_virt_test virt_x2apic_mode_test"
+extra_params = -cpu host,+vmx -append "+apic_reg_virt_test +virt_x2apic_mode_test"
arch = x86_64
groups = vmx
timeout = 10
@@ -261,13 +261,13 @@ timeout = 10
[vmx_apic_passthrough_thread]
file = vmx.flat
smp = 2
-extra_params = -cpu host,+vmx -m 2048 -append vmx_apic_passthrough_thread_test
+extra_params = -cpu host,+vmx -m 2048 -append '+vmx_apic_passthrough_thread_test'
arch = x86_64
groups = vmx
[vmx_vmcs_shadow_test]
file = vmx.flat
-extra_params = -cpu host,+vmx -append vmx_vmcs_shadow_test
+extra_params = -cpu host,+vmx -append '+vmx_vmcs_shadow_test'
arch = x86_64
groups = vmx
@@ -1894,9 +1894,9 @@ test_wanted(const char *name, const char *filters[], int filter_count)
if (filter[0] == '-') {
if (simple_glob(clean_name, filter + 1))
return false;
- } else {
+ } else if (filter[0] == '+') {
positive = true;
- match |= simple_glob(clean_name, filter);
+ match |= simple_glob(clean_name, filter + 1);
}
}
To introduce general boot parameters, avoid vmx boot parameters from colliding with the general ones. Precede the vmx test names with a plus sign ('+') to indicate a test should be executed in vmx, and ignore those that are not preceded with '-' or '+'. Signed-off-by: Nadav Amit <nadav.amit@gmail.com> --- x86/unittests.cfg | 32 ++++++++++++++++---------------- x86/vmx.c | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-)