Commit 6559b4a5 authored by Yang Zhong's avatar Yang Zhong Committed by Paolo Bonzini
Browse files

selftest: kvm: Move struct kvm_x86_state to header 



Those changes can avoid dereferencing pointer compile issue
when amx_test.c reference state->xsave.

Move struct kvm_x86_state definition to processor.h.

Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Message-Id: <20211223145322.2914028-3-yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 551447cf

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

+15 −1
Original line number Diff line number Diff line
@@ -94,6 +94,21 @@ struct desc_ptr { 
	uint64_t address;

} __attribute__((packed));



struct kvm_x86_state {

	struct kvm_xsave *xsave;

	struct kvm_vcpu_events events;

	struct kvm_mp_state mp_state;

	struct kvm_regs regs;

	struct kvm_xcrs xcrs;

	struct kvm_sregs sregs;

	struct kvm_debugregs debugregs;

	union {

		struct kvm_nested_state nested;

		char nested_[16384];

	};

	struct kvm_msrs msrs;

};



static inline uint64_t get_desc64_base(const struct desc64 *desc)

{

	return ((uint64_t)desc->base3 << 32) |
@@ -350,7 +365,6 @@ static inline unsigned long get_xmm(int n) 


bool is_intel_cpu(void);



struct kvm_x86_state;

struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid);

void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_x86_state *state);

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

+0 −15
Original line number Diff line number Diff line
@@ -1056,21 +1056,6 @@ void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) 
	sregs_dump(stream, &sregs, indent + 4);

}



struct kvm_x86_state {

	struct kvm_xsave *xsave;

	struct kvm_vcpu_events events;

	struct kvm_mp_state mp_state;

	struct kvm_regs regs;

	struct kvm_xcrs xcrs;

	struct kvm_sregs sregs;

	struct kvm_debugregs debugregs;

	union {

		struct kvm_nested_state nested;

		char nested_[16384];

	};

	struct kvm_msrs msrs;

};



static int kvm_get_num_msrs_fd(int kvm_fd)

{

	struct kvm_msr_list nmsrs;