| Date | Thu, 30 Apr 2009 09:56:51 -0700 | From | Greg KH <> | Subject | [patch 62/88] KVM: Fix cpuid leaf 0xb loop termination |
| |
2.6.28-stable review patch. If anyone has any objections, please let us know.
------------------
From: Nitin A Kamble <nitin.a.kamble@intel.com>
(cherry picked from 0853d2c1d849ef69884d2447d90d04007590b72b)
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1218,7 +1218,7 @@ static void do_cpuid_ent(struct kvm_cpui 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);
|