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

Commit bdb42f5a authored by Stephan Bärwolf's avatar Stephan Bärwolf Committed by Avi Kivity
Browse files

KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid" 



In order to be able to proceed checks on CPU-specific properties
within the emulator, function "get_cpuid" is introduced.
With "get_cpuid" it is possible to virtually call the guests
"cpuid"-opcode without changing the VM's context.

[mtosatti: cleanup/beautify code]

Signed-off-by: default avatarStephan Baerwolf <stephan.baerwolf@tu-ilmenau.de>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 50e92b3c

arch/x86/include/asm/kvm_emulate.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,9 @@ struct x86_emulate_ops { 
	int (*intercept)(struct x86_emulate_ctxt *ctxt,

	int (*intercept)(struct x86_emulate_ctxt *ctxt,

			 struct x86_instruction_info *info,

			 struct x86_instruction_info *info,

			 enum x86_intercept_stage stage);

			 enum x86_intercept_stage stage);



	bool (*get_cpuid)(struct x86_emulate_ctxt *ctxt,

			 u32 *eax, u32 *ebx, u32 *ecx, u32 *edx);

};

};





typedef u32 __attribute__((vector_size(16))) sse128_t;

typedef u32 __attribute__((vector_size(16))) sse128_t;

arch/x86/kvm/x86.c

+23 −0
Original line number Original line Diff line number Diff line
@@ -4180,6 +4180,28 @@ static int emulator_intercept(struct x86_emulate_ctxt *ctxt, 
	return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);

	return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);

}

}





static bool emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,

			       u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)

{

	struct kvm_cpuid_entry2 *cpuid = NULL;



	if (eax && ecx)

		cpuid = kvm_find_cpuid_entry(emul_to_vcpu(ctxt),

					    *eax, *ecx);



	if (cpuid) {

		*eax = cpuid->eax;

		*ecx = cpuid->ecx;

		if (ebx)

			*ebx = cpuid->ebx;

		if (edx)

			*edx = cpuid->edx;

		return true;

	}



	return false;

}



static struct x86_emulate_ops emulate_ops = {

static struct x86_emulate_ops emulate_ops = {

	.read_std            = kvm_read_guest_virt_system,

	.read_std            = kvm_read_guest_virt_system,

	.write_std           = kvm_write_guest_virt_system,

	.write_std           = kvm_write_guest_virt_system,
@@ -4211,6 +4233,7 @@ static struct x86_emulate_ops emulate_ops = { 
	.get_fpu             = emulator_get_fpu,

	.get_fpu             = emulator_get_fpu,

	.put_fpu             = emulator_put_fpu,

	.put_fpu             = emulator_put_fpu,

	.intercept           = emulator_intercept,

	.intercept           = emulator_intercept,

	.get_cpuid           = emulator_get_cpuid,

};

};





static void cache_all_regs(struct kvm_vcpu *vcpu)

static void cache_all_regs(struct kvm_vcpu *vcpu)