KVM: selftests: Drop @mode from common vm_create() helper

Drop @mode from vm_create() and have it use VM_MODE_DEFAULT.  Add and use
an inner helper, __vm_create(), to service the handful of tests that want
something other than VM_MODE_DEFAULT.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
index 441c98ffb8120d03c7890871b54d11fe4bd04bdc..ecfb773ec41eb34314c6ff3e71a250abfcc62ceb 100644 (file)
--- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c
+++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
@@ -416,7 +416,7 @@ static void run_test(struct vcpu_config *c)
 
        check_supported(c);
 
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
        prepare_vcpu_init(c, &init);
        aarch64_vcpu_add_default(vm, 0, &init, NULL);
        finalize_vcpu(vm, 0, c);

diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c
index de3b5e176d0441f4fcc7a1188f75686e9014362b..024a84064f1f6989e4f8ab608ba07c336ab8af87 100644 (file)
--- a/tools/testing/selftests/kvm/aarch64/psci_test.c
+++ b/tools/testing/selftests/kvm/aarch64/psci_test.c
@@ -78,7 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code)
        struct kvm_vcpu_init init;
        struct kvm_vm *vm;
 
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
        kvm_vm_elf_load(vm, program_invocation_name);
        ucall_init(vm, NULL);
 

diff --git a/tools/testing/selftests/kvm/aarch64/vcpu_width_config.c b/tools/testing/selftests/kvm/aarch64/vcpu_width_config.c
index 271fa90e53fd9f0c0ad2cd276746f5addfa23a55..4145c28a245abadc0f90086ff9c17ec86af19141 100644 (file)
--- a/tools/testing/selftests/kvm/aarch64/vcpu_width_config.c
+++ b/tools/testing/selftests/kvm/aarch64/vcpu_width_config.c
@@ -24,7 +24,7 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1,
        struct kvm_vm *vm;
        int ret;
 
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
 
        vm_vcpu_add(vm, 0);
        ret = __vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);
@@ -49,7 +49,7 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,
        struct kvm_vm *vm;
        int ret;
 
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
 
        vm_vcpu_add(vm, 0);
        vm_vcpu_add(vm, 1);
@@ -86,7 +86,7 @@ int main(void)
        }
 
        /* Get the preferred target type and copy that to init2 for later use */
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
        vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init1);
        kvm_vm_free(vm);
        init2 = init1;

diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
index 11bf606e31654604ffb29fac8ad30aa610ef5a45..01c01d40201fbab3d7fdc07d3e9d43a7e85d236f 100644 (file)
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -679,7 +679,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,
 
        pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode));
 
-       vm = vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);
+       vm = __vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);
        kvm_vm_elf_load(vm, program_invocation_name);
 #ifdef __x86_64__
        vm_create_irqchip(vm);

diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c
index 1c9e2295c75b7e5a3ecdb8343c35353793916547..81ba8645772ad5ec38665bfe66b1104418c1867c 100644 (file)
--- a/tools/testing/selftests/kvm/hardware_disable_test.c
+++ b/tools/testing/selftests/kvm/hardware_disable_test.c
@@ -104,7 +104,7 @@ static void run_test(uint32_t run)
        for (i = 0; i < VCPU_NUM; i++)
                CPU_SET(i, &cpu_set);
 
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
        kvm_vm_elf_load(vm, program_invocation_name);
        vm_create_irqchip(vm);
 

diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index 00f3103dc85ee622677156018b874912fd445f36..f6984b0c38168ae09b4c4bc3d0bf3ec72690702c 100644 (file)
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -110,7 +110,8 @@ int vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id,
 void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size);
 const char *vm_guest_mode_string(uint32_t i);
 
-struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages);
+struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t phy_pages);
+struct kvm_vm *vm_create(uint64_t phy_pages);
 void kvm_vm_free(struct kvm_vm *vmp);
 void kvm_vm_restart(struct kvm_vm *vmp);
 void kvm_vm_release(struct kvm_vm *vmp);

diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
index 6217f4630e6ca3a23af970de5d36ebe03949d675..4b149b383678ede156bcd5b62d9a48e194b42b13 100644 (file)
--- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c
+++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
@@ -229,8 +229,7 @@ int main(int argc, char *argv[])
        vms = malloc(sizeof(vms[0]) * max_vm);
        TEST_ASSERT(vms, "Allocate memory for storing VM pointers");
        for (i = 0; i < max_vm; ++i) {
-               vms[i] = vm_create(VM_MODE_DEFAULT,
-                               DEFAULT_GUEST_PHY_PAGES);
+               vms[i] = vm_create(DEFAULT_GUEST_PHY_PAGES);
                for (j = 0; j < max_vcpu; ++j)
                        vm_vcpu_add(vms[i], j);
        }

diff --git a/tools/testing/selftests/kvm/kvm_create_max_vcpus.c b/tools/testing/selftests/kvm/kvm_create_max_vcpus.c
index bb69b75eac230f9f6ffe27234d54b86ff11cbaba..9de5e1376c497e8e3b1241ed198d15af4de4a9bf 100644 (file)
--- a/tools/testing/selftests/kvm/kvm_create_max_vcpus.c
+++ b/tools/testing/selftests/kvm/kvm_create_max_vcpus.c
@@ -28,7 +28,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus)
        pr_info("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_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
 
        for (i = first_vcpu_id; i < first_vcpu_id + num_vcpus; i++)
                /* This asserts that the vCPU was created. */

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index fdcaf74b595954f68c503b50cb5c9bdee88133f6..bab4ab297fcc9ba952a770c3746d5ea9e2b3ccf3 100644 (file)
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -234,25 +234,7 @@ const struct vm_guest_mode_params vm_guest_mode_params[] = {
 _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) == NUM_VM_MODES,
               "Missing new mode params?");
 
-/*
- * VM Create
- *
- * Input Args:
- *   mode - VM Mode (e.g. VM_MODE_P52V48_4K)
- *   phy_pages - Physical memory pages
- *
- * Output Args: None
- *
- * Return:
- *   Pointer to opaque structure that describes the created VM.
- *
- * Creates a VM with the mode specified by mode (e.g. VM_MODE_P52V48_4K).
- * When phy_pages is non-zero, a memory region of phy_pages physical pages
- * is created and mapped starting at guest physical address 0.  The file
- * descriptor to control the created VM is created with the permissions
- * given by perm (e.g. O_RDWR).
- */
-struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages)
+struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t phy_pages)
 {
        struct kvm_vm *vm;
 
@@ -361,11 +343,31 @@ struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages)
        return vm;
 }
 
+/*
+ * VM Create
+ *
+ * Input Args:
+ *   phy_pages - Physical memory pages
+ *
+ * Output Args: None
+ *
+ * Return:
+ *   Pointer to opaque structure that describes the created VM.
+ *
+ * Creates a VM with the default physical/virtual address widths and page size.
+ * When phy_pages is non-zero, a memory region of phy_pages physical pages
+ * is created and mapped starting at guest physical address 0.
+ */
+struct kvm_vm *vm_create(uint64_t phy_pages)
+{
+       return __vm_create(VM_MODE_DEFAULT, phy_pages);
+}
+
 struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages)
 {
        struct kvm_vm *vm;
 
-       vm = vm_create(mode, pages);
+       vm = __vm_create(mode, pages);
 
        kvm_vm_elf_load(vm, program_invocation_name);
 

diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c
index d97cfd6866c329ddfb6691afe63504c4173ab4df..89b13f23c3ac3856317caa8ec6a21d14e235444a 100644 (file)
--- a/tools/testing/selftests/kvm/set_memory_region_test.c
+++ b/tools/testing/selftests/kvm/set_memory_region_test.c
@@ -314,7 +314,7 @@ static void test_zero_memory_regions(void)
 
        pr_info("Testing KVM_RUN with zero added memory regions\n");
 
-       vm = vm_create(VM_MODE_DEFAULT, 0);
+       vm = vm_create(0);
        vm_vcpu_add(vm, VCPU_ID);
 
        TEST_ASSERT(!ioctl(vm_get_fd(vm), KVM_SET_NR_MMU_PAGES, 64),
@@ -354,7 +354,7 @@ static void test_add_max_memory_regions(void)
                    "KVM_CAP_NR_MEMSLOTS should be greater than 0");
        pr_info("Allowed number of memory slots: %i\n", max_mem_slots);
 
-       vm = vm_create(VM_MODE_DEFAULT, 0);
+       vm = vm_create(0);
 
        /* Check it can be added memory slots up to the maximum allowed */
        pr_info("Adding slots 0..%i, each memory region with %dK size\n",

diff --git a/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c b/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c
index 28cc316c5dbe50d954bf0d62eb5bd36f1d17e597..e83afd4bb4cf080bae1a043181e25e47c5f7b502 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c
+++ b/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
        struct kvm_enable_cap cap = { 0 };
        int ret;
 
-       vm = vm_create(VM_MODE_DEFAULT, 0);
+       vm = vm_create(0);
 
        /* Get KVM_CAP_MAX_VCPU_ID cap supported in KVM */
        ret = vm_check_cap(vm, KVM_CAP_MAX_VCPU_ID);

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 ee3d058a9fe1ed3ec880268287f0003cb191339e..b4da92ddc1c6a1769eb3656d049ba19dd5f92c37 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
+++ b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
@@ -88,7 +88,7 @@ static struct kvm_vm *create_vm(void)
        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(VM_MODE_DEFAULT, pages);
+       vm = vm_create(pages);
 
        kvm_vm_elf_load(vm, program_invocation_name);
        vm_create_irqchip(vm);

diff --git a/tools/testing/selftests/kvm/x86_64/set_sregs_test.c b/tools/testing/selftests/kvm/x86_64/set_sregs_test.c
index 44711ab735c31ab3e5a8ffed778986bab190812b..4dc7fd925023d5cc663e96e671ca738b92ea6e87 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/set_sregs_test.c
+++ b/tools/testing/selftests/kvm/x86_64/set_sregs_test.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
         * use it to verify all supported CR4 bits can be set prior to defining
         * the vCPU model, i.e. without doing KVM_SET_CPUID2.
         */
-       vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
+       vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
        vm_vcpu_add(vm, VCPU_ID);
 
        vcpu_sregs_get(vm, VCPU_ID, &sregs);

diff --git a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c
index b0c052443c446f56a507dedd139b5b8ae5297414..7424bec5ae2395bef8528dffb1671ef878bf03a2 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c
+++ b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c
@@ -54,7 +54,7 @@ static struct kvm_vm *sev_vm_create(bool es)
        struct kvm_sev_launch_start start = { 0 };
        int i;
 
-       vm = vm_create(VM_MODE_DEFAULT, 0);
+       vm = vm_create(0);
        sev_ioctl(vm->fd, es ? KVM_SEV_ES_INIT : KVM_SEV_INIT, NULL);
        for (i = 0; i < NR_MIGRATE_TEST_VCPUS; ++i)
                vm_vcpu_add(vm, i);
@@ -71,7 +71,7 @@ static struct kvm_vm *aux_vm_create(bool with_vcpus)
        struct kvm_vm *vm;
        int i;
 
-       vm = vm_create(VM_MODE_DEFAULT, 0);
+       vm = vm_create(0);
        if (!with_vcpus)
                return vm;
 
@@ -174,7 +174,7 @@ static void test_sev_migrate_parameters(void)
                *sev_es_vm_no_vmsa;
        int ret;
 
-       vm_no_vcpu = vm_create(VM_MODE_DEFAULT, 0);
+       vm_no_vcpu = vm_create(0);
        vm_no_sev = aux_vm_create(true);
        ret = __sev_migrate_from(vm_no_vcpu->fd, vm_no_sev->fd);
        TEST_ASSERT(ret == -1 && errno == EINVAL,
@@ -186,7 +186,7 @@ static void test_sev_migrate_parameters(void)
 
        sev_vm = sev_vm_create(/* es= */ false);
        sev_es_vm = sev_vm_create(/* es= */ true);
-       sev_es_vm_no_vmsa = vm_create(VM_MODE_DEFAULT, 0);
+       sev_es_vm_no_vmsa = vm_create(0);
        sev_ioctl(sev_es_vm_no_vmsa->fd, KVM_SEV_ES_INIT, NULL);
        vm_vcpu_add(sev_es_vm_no_vmsa, 1);