Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49fe9a5d authored by Thomas Huth's avatar Thomas Huth Committed by Christian Borntraeger
Browse files

KVM: selftests: Move kvm_create_max_vcpus test to generic code 



There is nothing x86-specific in the test apart from the VM_MODE_P52V48_4K
which we can now replace with VM_MODE_DEFAULT. Thus let's move the file to
the main folder and enable it for aarch64 and s390x, too.

Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20190523164309.13345-10-thuth@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent ee1563f4

tools/testing/selftests/kvm/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -22,15 +22,17 @@ TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test 
TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid

TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test

TEST_GEN_PROGS_x86_64 += x86_64/smm_test

TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus

TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test

TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus

TEST_GEN_PROGS_x86_64 += dirty_log_test

TEST_GEN_PROGS_x86_64 += clear_dirty_log_test



TEST_GEN_PROGS_aarch64 += dirty_log_test

TEST_GEN_PROGS_aarch64 += clear_dirty_log_test

TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus



TEST_GEN_PROGS_s390x += s390x/sync_regs_test

TEST_GEN_PROGS_s390x += kvm_create_max_vcpus



TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))

LIBKVM += $(LIBKVM_$(UNAME_M))

tools/testing/selftests/kvm/x86_64/kvm_create_max_vcpus.c→tools/testing/selftests/kvm/kvm_create_max_vcpus.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * kvm_create_max_vcpus

 *
@@ -28,7 +29,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus) 
	printf("Testing creating %d vCPUs, with IDs %d...%d.\n",

	       num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus - 1);



	vm = vm_create(VM_MODE_P52V48_4K, DEFAULT_GUEST_PHY_PAGES, O_RDWR);

	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR);



	for (i = 0; i < num_vcpus; i++) {

		int vcpu_id = first_vcpu_id + i;