Commit 0017f93a authored by Avi Kivity's avatar Avi Kivity

KVM: x86 emulator: change ->get_cpuid() accessor to use the x86 semantics

Instead of getting an exact leaf, follow the spec and fall back to the last
main leaf instead.  This lets us easily emulate the cpuid instruction in the
emulator.
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 62046e5a
...@@ -192,8 +192,8 @@ struct x86_emulate_ops { ...@@ -192,8 +192,8 @@ struct x86_emulate_ops {
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, void (*get_cpuid)(struct x86_emulate_ctxt *ctxt,
u32 *eax, u32 *ebx, u32 *ecx, u32 *edx); u32 *eax, u32 *ebx, u32 *ecx, u32 *edx);
}; };
typedef u32 __attribute__((vector_size(16))) sse128_t; typedef u32 __attribute__((vector_size(16))) sse128_t;
......
...@@ -1993,8 +1993,8 @@ static bool vendor_intel(struct x86_emulate_ctxt *ctxt) ...@@ -1993,8 +1993,8 @@ static bool vendor_intel(struct x86_emulate_ctxt *ctxt)
u32 eax, ebx, ecx, edx; u32 eax, ebx, ecx, edx;
eax = ecx = 0; eax = ecx = 0;
return ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx) ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx);
&& ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx return ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx
&& ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx && ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx
&& edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx; && edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx;
} }
...@@ -2013,32 +2013,31 @@ static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt) ...@@ -2013,32 +2013,31 @@ static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt)
eax = 0x00000000; eax = 0x00000000;
ecx = 0x00000000; ecx = 0x00000000;
if (ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx)) { ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx);
/* /*
* Intel ("GenuineIntel") * Intel ("GenuineIntel")
* remark: Intel CPUs only support "syscall" in 64bit * remark: Intel CPUs only support "syscall" in 64bit
* longmode. Also an 64bit guest with a * longmode. Also an 64bit guest with a
* 32bit compat-app running will #UD !! While this * 32bit compat-app running will #UD !! While this
* behaviour can be fixed (by emulating) into AMD * behaviour can be fixed (by emulating) into AMD
* response - CPUs of AMD can't behave like Intel. * response - CPUs of AMD can't behave like Intel.
*/ */
if (ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx && if (ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx &&
ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx && ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx &&
edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx) edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx)
return false; return false;
/* AMD ("AuthenticAMD") */ /* AMD ("AuthenticAMD") */
if (ebx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx && if (ebx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx &&
ecx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx && ecx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx &&
edx == X86EMUL_CPUID_VENDOR_AuthenticAMD_edx) edx == X86EMUL_CPUID_VENDOR_AuthenticAMD_edx)
return true; return true;
/* AMD ("AMDisbetter!") */ /* AMD ("AMDisbetter!") */
if (ebx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx && if (ebx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx &&
ecx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx && ecx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx &&
edx == X86EMUL_CPUID_VENDOR_AMDisbetterI_edx) edx == X86EMUL_CPUID_VENDOR_AMDisbetterI_edx)
return true; return true;
}
/* default: (not Intel, not AMD), apply Intel's stricter rules... */ /* default: (not Intel, not AMD), apply Intel's stricter rules... */
return false; return false;
......
...@@ -4302,26 +4302,10 @@ static int emulator_intercept(struct x86_emulate_ctxt *ctxt, ...@@ -4302,26 +4302,10 @@ 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, static void emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,
u32 *eax, u32 *ebx, u32 *ecx, u32 *edx) u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
{ {
struct kvm_cpuid_entry2 *cpuid = NULL; kvm_cpuid(emul_to_vcpu(ctxt), eax, ebx, ecx, edx);
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 = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment