summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Christopherson <seanjc@google.com>2022-04-18 13:00:58 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2022-06-11 11:46:31 -0400
commitbb47ed8b71d06d7ede40374fd3064e2457eafb62 (patch)
tree37f4c6c19ebdaaf7d3aec1cffb9d85ebf58bef13
parent0c276ff22c7eb1a6ebf889b25d631f4cd358a482 (diff)
downloadlinux-bb47ed8b71d06d7ede40374fd3064e2457eafb62.tar.bz2
KVM: selftests: Use vm_create_without_vcpus() in set_boot_cpu_id
Use vm_create_without_vcpus() in set_boot_cpu_id instead of open coding the equivlant now that the "without_vcpus" variant does vm_adjust_num_guest_pages(). Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
index b4da92ddc1c6..4c5775a8de6a 100644
--- a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
+++ b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
@@ -82,18 +82,11 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid)
static struct kvm_vm *create_vm(void)
{
- struct kvm_vm *vm;
uint64_t vcpu_pages = (DEFAULT_STACK_PGS) * 2;
uint64_t extra_pg_pages = vcpu_pages / PTES_PER_MIN_PAGE * N_VCPU;
uint64_t pages = DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages;
- pages = vm_adjust_num_guest_pages(VM_MODE_DEFAULT, pages);
- vm = vm_create(pages);
-
- kvm_vm_elf_load(vm, program_invocation_name);
- vm_create_irqchip(vm);
-
- return vm;
+ return vm_create_without_vcpus(VM_MODE_DEFAULT, pages);
}
static void add_x86_vcpu(struct kvm_vm *vm, uint32_t vcpuid, bool bsp_code)