summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2008-11-05 15:37:36 -0800
committerAvi Kivity <avi@redhat.com>2008-12-31 16:52:24 +0200
commit0853d2c1d849ef69884d2447d90d04007590b72b (patch)
tree6501a31cffdc2fcb992d66173ad799439b73d118 /arch
parentfcfdbd266a41d3e41d17666de410a24995fde03a (diff)
downloadlinux-stable-0853d2c1d849ef69884d2447d90d04007590b72b.tar.gz
linux-stable-0853d2c1d849ef69884d2447d90d04007590b72b.tar.bz2
linux-stable-0853d2c1d849ef69884d2447d90d04007590b72b.zip
KVM: Fix cpuid leaf 0xb loop termination
For cpuid leaf 0xb the bits 8-15 in ECX register define the end of counting leaf. The previous code was using bits 0-7 for this purpose, which is a bug. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9a4a39cfe6ef..2889a0f359ea 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1276,7 +1276,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
entry->flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
/* read more entries until level_type is zero */
for (i = 1; *nent < maxnent; ++i) {
- level_type = entry[i - 1].ecx & 0xff;
+ level_type = entry[i - 1].ecx & 0xff00;
if (!level_type)
break;
do_cpuid_1_ent(&entry[i], function, i);