From 8ae61049521a6191f6e34489b9532c1d41f88bee Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 2 May 2012 17:55:56 +0300 Subject: [PATCH] --- yaml --- r: 307882 b: refs/heads/master c: 57c22e5f35aa4b9b2fe11f73f3e62bbf9ef36190 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/virtual/kvm/cpuid.txt | 6 +++++- trunk/arch/x86/kvm/cpuid.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 878bdd3e5768..909fb0836b07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e726b1bd64b0b8945c171d2d4bf749fba9fc0800 +refs/heads/master: 57c22e5f35aa4b9b2fe11f73f3e62bbf9ef36190 diff --git a/trunk/Documentation/virtual/kvm/cpuid.txt b/trunk/Documentation/virtual/kvm/cpuid.txt index 882068538c9c..83afe65d4966 100644 --- a/trunk/Documentation/virtual/kvm/cpuid.txt +++ b/trunk/Documentation/virtual/kvm/cpuid.txt @@ -10,11 +10,15 @@ a guest. KVM cpuid functions are: function: KVM_CPUID_SIGNATURE (0x40000000) -returns : eax = 0, +returns : eax = 0x40000001, ebx = 0x4b4d564b, ecx = 0x564b4d56, edx = 0x4d. Note that this value in ebx, ecx and edx corresponds to the string "KVMKVMKVM". +The value in eax corresponds to the maximum cpuid function present in this leaf, +and will be updated if more functions are added in the future. +Note also that old hosts set eax value to 0x0. This should +be interpreted as if the value was 0x40000001. This function queries the presence of KVM cpuid leafs. diff --git a/trunk/arch/x86/kvm/cpuid.c b/trunk/arch/x86/kvm/cpuid.c index c2134b881033..7df1c6d839fb 100644 --- a/trunk/arch/x86/kvm/cpuid.c +++ b/trunk/arch/x86/kvm/cpuid.c @@ -398,7 +398,7 @@ static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, case KVM_CPUID_SIGNATURE: { char signature[12] = "KVMKVMKVM\0\0"; u32 *sigptr = (u32 *)signature; - entry->eax = 0; + entry->eax = KVM_CPUID_FEATURES; entry->ebx = sigptr[0]; entry->ecx = sigptr[1]; entry->edx = sigptr[2];