clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-06 05:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm: Fix off-by-one bugs in kvm__setup_cpuid()

Browse Source 
The cpuid_highest_func() and cpuid_highest_ext_func() return the highest
possible function number, not the first non-existing function.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
This commit is contained in:
Pekka Enberg
2015-06-01 16:39:39 +01:00
committed by Will Deacon
parent 226b700ef5
commit 1b3d8101f1
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpuid.c
+2 -13
View File
@@ -84,7 +84,7 @@ void kvm__setup_cpuid(struct kvm *self)
highest = cpuid_highest_func();
for (function = 0; function < highest; function++) {
for (function = 0; function <= highest; function++) {
/*
* NOTE NOTE NOTE! Functions 0x0b and 0x0d seem to need special
* treatment as per qemu sources but we treat them as regular
@@ -176,7 +176,7 @@ void kvm__setup_cpuid(struct kvm *self)
highest_ext = cpuid_highest_ext_func();
for (function = CPUID_GET_HIGHEST_EXT_FUNCTION; function < highest_ext; function++) {
for (function = CPUID_GET_HIGHEST_EXT_FUNCTION; function <= highest_ext; function++) {
struct cpuid_regs regs;
regs = (struct cpuid_regs) {
@@ -195,17 +195,6 @@ void kvm__setup_cpuid(struct kvm *self)
};
}
/*
* We need to set up MAXPHYADDR; otherwise switching to long mode in the
* guest will triple fault.
*/
if (highest_ext <= 0x80000008) {
kvm_cpuid->entries[ndx++] = (struct kvm_cpuid_entry2) {
.function = 0x80000008,
.eax = 0x00003028, /* 64-bit CPU */
};
}
assert(ndx < MAX_KVM_CPUID_ENTRIES);
kvm_cpuid->nent = ndx;