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

Commit fb89f4ea authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

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: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f5dd4ccf

tools/testing/selftests/kvm/include/aarch64/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -53,5 +53,7 @@ static inline void set_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, uint 
}



void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *init);

void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid,

			      struct kvm_vcpu_init *init, void *guest_code);



#endif /* SELFTEST_KVM_PROCESSOR_H */

tools/testing/selftests/kvm/lib/aarch64/processor.c

+7 −2
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) 
		indent, "", pstate, pc);

}



void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)

void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid,

			      struct kvm_vcpu_init *init, void *guest_code)

{

	size_t stack_size = vm->page_size == 4096 ?

					DEFAULT_STACK_PGS * vm->page_size :
@@ -319,9 +320,13 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) 
					DEFAULT_ARM64_GUEST_STACK_VADDR_MIN, 0, 0);



	vm_vcpu_add(vm, vcpuid);

	aarch64_vcpu_setup(vm, vcpuid, NULL);

	aarch64_vcpu_setup(vm, vcpuid, init);



	set_reg(vm, vcpuid, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size);

	set_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code);

}



void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)

{

	aarch64_vcpu_add_default(vm, vcpuid, NULL, guest_code);

}