Commit 877bd399 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Rename MP_STATE and GUEST_DEBUG helpers for consistency 



Move the get/set part of the MP_STATE and GUEST_DEBUG helpers to the end
to align with the many other ioctl() wrappers/helpers.  Note, this is not
an endorsement of the predominant style, the goal is purely to provide
consistency in the selftests.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2128e30b

tools/testing/selftests/kvm/aarch64/psci_test.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) 
		.mp_state = KVM_MP_STATE_STOPPED,

	};



	vcpu_set_mp_state(vm, vcpuid, &mp_state);

	vcpu_mp_state_set(vm, vcpuid, &mp_state);

}



static struct kvm_vm *setup_vm(void *guest_code)

tools/testing/selftests/kvm/include/kvm_util_base.h

+7 −2
Original line number Diff line number Diff line
@@ -374,13 +374,18 @@ static inline void vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id, 
	vcpu_ioctl(vm, vcpu_id, KVM_ENABLE_CAP, &enable_cap);

}



static inline void vcpu_set_guest_debug(struct kvm_vm *vm, uint32_t vcpuid,

static inline void vcpu_guest_debug_set(struct kvm_vm *vm, uint32_t vcpuid,

					struct kvm_guest_debug *debug)

{

	vcpu_ioctl(vm, vcpuid, KVM_SET_GUEST_DEBUG, debug);

}



static inline void vcpu_set_mp_state(struct kvm_vm *vm, uint32_t vcpuid,

static inline void vcpu_mp_state_get(struct kvm_vm *vm, uint32_t vcpuid,

				     struct kvm_mp_state *mp_state)

{

	vcpu_ioctl(vm, vcpuid, KVM_GET_MP_STATE, mp_state);

}

static inline void vcpu_mp_state_set(struct kvm_vm *vm, uint32_t vcpuid,

				     struct kvm_mp_state *mp_state)

{

	vcpu_ioctl(vm, vcpuid, KVM_SET_MP_STATE, mp_state);

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

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) 


	/* Setup the MP state */

	mp_state.mp_state = 0;

	vcpu_set_mp_state(vm, vcpuid, &mp_state);

	vcpu_mp_state_set(vm, vcpuid, &mp_state);

}



/*

tools/testing/selftests/kvm/x86_64/debug_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void guest_code(void) 
}



#define  CLEAR_DEBUG()  memset(&debug, 0, sizeof(debug))

#define  APPLY_DEBUG()  vcpu_set_guest_debug(vm, VCPU_ID, &debug)

#define  APPLY_DEBUG()  vcpu_guest_debug_set(vm, VCPU_ID, &debug)

#define  CAST_TO_RIP(v)  ((unsigned long long)&(v))

#define  SET_RIP(v)  do {				\

		vcpu_regs_get(vm, VCPU_ID, &regs);	\

tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void run_test(bool is_nmi) 
	vcpu_args_set(vm, VCPU_ID, 3, svm_gva, (uint64_t)is_nmi, (uint64_t)idt_alt_vm);



	memset(&debug, 0, sizeof(debug));

	vcpu_set_guest_debug(vm, VCPU_ID, &debug);

	vcpu_guest_debug_set(vm, VCPU_ID, &debug);



	struct kvm_run *run = vcpu_state(vm, VCPU_ID);

	struct ucall uc;