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: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 18 deletions

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8eacb2e6456..ff0b487e725 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -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);
 }
 
-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)
 {
-        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;
+        kvm_cpuid(emul_to_vcpu(ctxt), eax, ebx, ecx, edx);
 }
 
 static struct x86_emulate_ops emulate_ops = {