mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-18 11:54:37 +08:00
KVM: selftests: Unconditionally use memslot 0 when loading elf binary
Use memslot '0' for all vm_vaddr_alloc() calls when loading the test binary. This is the first step toward adding a helper to handle page allocations with a default value for the target memslot. No functional change intended. Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20210622200529.3650424-4-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
96d41cfd1b
commit
7a4f1a75b7
@ -680,7 +680,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, O_RDWR);
|
||||
kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
|
||||
kvm_vm_elf_load(vm, program_invocation_name);
|
||||
#ifdef __x86_64__
|
||||
vm_create_irqchip(vm);
|
||||
#endif
|
||||
|
@ -105,7 +105,7 @@ static void run_test(uint32_t run)
|
||||
CPU_SET(i, &cpu_set);
|
||||
|
||||
vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR);
|
||||
kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
|
||||
kvm_vm_elf_load(vm, program_invocation_name);
|
||||
vm_create_irqchip(vm);
|
||||
|
||||
pr_debug("%s: [%d] start vcpus\n", __func__, run);
|
||||
|
@ -98,8 +98,7 @@ uint32_t kvm_vm_reset_dirty_ring(struct kvm_vm *vm);
|
||||
int kvm_memcmp_hva_gva(void *hva, struct kvm_vm *vm, const vm_vaddr_t gva,
|
||||
size_t len);
|
||||
|
||||
void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename,
|
||||
uint32_t data_memslot, uint32_t pgd_memslot);
|
||||
void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename);
|
||||
|
||||
void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent);
|
||||
|
||||
|
@ -111,8 +111,7 @@ static void elfhdr_get(const char *filename, Elf64_Ehdr *hdrp)
|
||||
* by the image and it needs to have sufficient available physical pages, to
|
||||
* back the virtual pages used to load the image.
|
||||
*/
|
||||
void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename,
|
||||
uint32_t data_memslot, uint32_t pgd_memslot)
|
||||
void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename)
|
||||
{
|
||||
off_t offset, offset_rv;
|
||||
Elf64_Ehdr hdr;
|
||||
@ -164,8 +163,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename,
|
||||
seg_vend |= vm->page_size - 1;
|
||||
size_t seg_size = seg_vend - seg_vstart + 1;
|
||||
|
||||
vm_vaddr_t vaddr = vm_vaddr_alloc(vm, seg_size, seg_vstart,
|
||||
data_memslot, pgd_memslot);
|
||||
vm_vaddr_t vaddr = vm_vaddr_alloc(vm, seg_size, seg_vstart, 0, 0);
|
||||
TEST_ASSERT(vaddr == seg_vstart, "Unable to allocate "
|
||||
"virtual memory for segment at requested min addr,\n"
|
||||
" segment idx: %u\n"
|
||||
|
@ -365,7 +365,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,
|
||||
pages = vm_adjust_num_guest_pages(mode, pages);
|
||||
vm = vm_create(mode, pages, O_RDWR);
|
||||
|
||||
kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
|
||||
kvm_vm_elf_load(vm, program_invocation_name);
|
||||
|
||||
#ifdef __x86_64__
|
||||
vm_create_irqchip(vm);
|
||||
|
@ -90,7 +90,7 @@ static struct kvm_vm *create_vm(void)
|
||||
pages = vm_adjust_num_guest_pages(VM_MODE_DEFAULT, pages);
|
||||
vm = vm_create(VM_MODE_DEFAULT, pages, O_RDWR);
|
||||
|
||||
kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
|
||||
kvm_vm_elf_load(vm, program_invocation_name);
|
||||
vm_create_irqchip(vm);
|
||||
|
||||
return vm;
|
||||
|
Loading…
Reference in New Issue
Block a user