aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu/vmware.c
diff options
context:
space:
mode:
authorAlok Kataria <akataria@vmware.com>2008-11-03 15:50:38 -0800
committerH. Peter Anvin <hpa@zytor.com>2008-11-04 13:59:00 -0800
commitfd8cd7e1919fc1c27fe2fdccd2a1cd32f791ef0f (patch)
treeb2b1482133a10f8de3d8c85a1a291fd93ead4b2c /arch/x86/kernel/cpu/vmware.c
parent6bdbfe99916398dbb28d83833cc04757110f2738 (diff)
x86: vmware: look for DMI string in the product serial key
Impact: Should permit VMware detection on older platforms where the vendor is changed. Could theoretically cause a regression if some weird serial number scheme contains the string "VMware" by pure chance. Seems unlikely, especially with the mixed case. In some user configured cases, VMware may choose not to put a VMware specific DMI string, but the product serial key is always there and is VMware specific. Add a interface to check the serial key, when checking for VMware in the DMI information. Signed-off-by: Alok N Kataria <akataria@vmware.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu/vmware.c')
-rw-r--r--arch/x86/kernel/cpu/vmware.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index a0905ecfe7d..c034bda842d 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -61,6 +61,11 @@ static unsigned long __vmware_get_tsc_khz(void)
return tsc_hz;
}
+/*
+ * While checking the dmi string infomation, just checking the product
+ * serial key should be enough, as this will always have a VMware
+ * specific string when running under VMware hypervisor.
+ */
int vmware_platform(void)
{
if (cpu_has_hypervisor) {
@@ -74,7 +79,7 @@ int vmware_platform(void)
hyper_vendor_id[12] = '\0';
if (!strcmp(hyper_vendor_id, "VMwareVMware"))
return 1;
- } else if (dmi_available && dmi_name_in_vendors("VMware") &&
+ } else if (dmi_available && dmi_name_in_serial("VMware") &&
__vmware_platform())
return 1;