Commit 35b6cb82 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Convert vmx_invalid_nested_guest_state away from VCPU_ID 



Convert vmx_invalid_nested_guest_state to use vm_create_with_one_vcpu() and
pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.

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

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ 




#include "kselftest.h"

#include "kselftest.h"





#define VCPU_ID	0

#define ARBITRARY_IO_PORT 0x2000

#define ARBITRARY_IO_PORT 0x2000





static struct kvm_vm *vm;

static struct kvm_vm *vm;
@@ -55,20 +54,21 @@ int main(int argc, char *argv[]) 
{

{

	vm_vaddr_t vmx_pages_gva;

	vm_vaddr_t vmx_pages_gva;

	struct kvm_sregs sregs;

	struct kvm_sregs sregs;

	struct kvm_vcpu *vcpu;

	struct kvm_run *run;

	struct kvm_run *run;

	struct ucall uc;

	struct ucall uc;





	nested_vmx_check_supported();

	nested_vmx_check_supported();





	vm = vm_create_default(VCPU_ID, 0, (void *) l1_guest_code);

	vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);





	/* Allocate VMX pages and shared descriptors (vmx_pages). */

	/* Allocate VMX pages and shared descriptors (vmx_pages). */

	vcpu_alloc_vmx(vm, &vmx_pages_gva);

	vcpu_alloc_vmx(vm, &vmx_pages_gva);

	vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);

	vcpu_args_set(vm, vcpu->id, 1, vmx_pages_gva);





	vcpu_run(vm, VCPU_ID);

	vcpu_run(vm, vcpu->id);





	run = vcpu_state(vm, VCPU_ID);

	run = vcpu->run;





	/*

	/*

	 * The first exit to L0 userspace should be an I/O access from L2.

	 * The first exit to L0 userspace should be an I/O access from L2.
@@ -88,13 +88,13 @@ int main(int argc, char *argv[]) 
	 * emulating invalid guest state for L2.

	 * emulating invalid guest state for L2.

	 */

	 */

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

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

	vcpu_sregs_get(vm, VCPU_ID, &sregs);

	vcpu_sregs_get(vm, vcpu->id, &sregs);

	sregs.tr.unusable = 1;

	sregs.tr.unusable = 1;

	vcpu_sregs_set(vm, VCPU_ID, &sregs);

	vcpu_sregs_set(vm, vcpu->id, &sregs);





	vcpu_run(vm, VCPU_ID);

	vcpu_run(vm, vcpu->id);





	switch (get_ucall(vm, VCPU_ID, &uc)) {

	switch (get_ucall(vm, vcpu->id, &uc)) {

	case UCALL_DONE:

	case UCALL_DONE:

		break;

		break;

	case UCALL_ABORT:

	case UCALL_ABORT: