Merge tag 'kvm-s390-next-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / tools / testing / selftests / kvm / lib / s390x / processor.c

diff --git a/tools/testing/selftests/kvm/lib/s390x/processor.c b/tools/testing/selftests/kvm/lib/s390x/processor.c
index c8759445e7d335374cca3d51a0913afca4cc9dd0..32a02360b1eb031ab81eca2e4c65aa82217e6a24 100644 (file)
--- a/tools/testing/selftests/kvm/lib/s390x/processor.c
+++ b/tools/testing/selftests/kvm/lib/s390x/processor.c
@@ -252,7 +252,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)
        stack_vaddr = vm_vaddr_alloc(vm, stack_size,
                                     DEFAULT_GUEST_STACK_VADDR_MIN, 0, 0);
 
-       vm_vcpu_add(vm, vcpuid, 0, 0);
+       vm_vcpu_add(vm, vcpuid);
 
        /* Setup guest registers */
        vcpu_regs_get(vm, vcpuid, &regs);
@@ -260,6 +260,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)
        vcpu_regs_set(vm, vcpuid, &regs);
 
        vcpu_sregs_get(vm, vcpuid, &sregs);
+       sregs.crs[0] |= 0x00040000;             /* Enable floating point regs */
        sregs.crs[1] = vm->pgd | 0xf;           /* Primary region table */
        vcpu_sregs_set(vm, vcpuid, &sregs);
 
@@ -268,15 +269,6 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)
        run->psw_addr = (uintptr_t)guest_code;
 }
 
-void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_memslot)
-{
-       struct kvm_sregs sregs;
-
-       vcpu_sregs_get(vm, vcpuid, &sregs);
-       sregs.crs[0] |= 0x00040000;             /* Enable floating point regs */
-       vcpu_sregs_set(vm, vcpuid, &sregs);
-}
-
 void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent)
 {
        struct vcpu *vcpu = vm->vcpu_head;