Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kvm: selftests: introduce aarch64_vcpu_add_default

This is the same as vm_vcpu_add_default, but it also takes a
kvm_vcpu_init struct pointer.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Andrew Jones and committed by
Paolo Bonzini
fb89f4ea f5dd4ccf

+9 -2
+2
tools/testing/selftests/kvm/include/aarch64/processor.h
··· 53 53 } 54 54 55 55 void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *init); 56 + void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, 57 + struct kvm_vcpu_init *init, void *guest_code); 56 58 57 59 #endif /* SELFTEST_KVM_PROCESSOR_H */
+7 -2
tools/testing/selftests/kvm/lib/aarch64/processor.c
··· 310 310 indent, "", pstate, pc); 311 311 } 312 312 313 - void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) 313 + void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, 314 + struct kvm_vcpu_init *init, void *guest_code) 314 315 { 315 316 size_t stack_size = vm->page_size == 4096 ? 316 317 DEFAULT_STACK_PGS * vm->page_size : ··· 320 319 DEFAULT_ARM64_GUEST_STACK_VADDR_MIN, 0, 0); 321 320 322 321 vm_vcpu_add(vm, vcpuid); 323 - aarch64_vcpu_setup(vm, vcpuid, NULL); 322 + aarch64_vcpu_setup(vm, vcpuid, init); 324 323 325 324 set_reg(vm, vcpuid, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size); 326 325 set_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code); 327 326 } 328 327 328 + void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) 329 + { 330 + aarch64_vcpu_add_default(vm, vcpuid, NULL, guest_code); 331 + }