adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 20:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: vmware: look for DMI string in the product serial key

Browse source 
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>
This commit is contained in:
Alok Kataria 2008-11-03 15:50:38 -08:00 committed by H. Peter Anvin
parent 6bdbfe9991
commit fd8cd7e191
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/x86/kernel/cpu/vmware.c
View file

@ -61,6 +61,11 @@ static unsigned long __vmware_get_tsc_khz(void)
return tsc_hz; 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) int vmware_platform(void)
{ {
if (cpu_has_hypervisor) { if (cpu_has_hypervisor) {
@ -74,7 +79,7 @@ int vmware_platform(void)
hyper_vendor_id[12] = '\0'; hyper_vendor_id[12] = '\0';
if (!strcmp(hyper_vendor_id, "VMwareVMware")) if (!strcmp(hyper_vendor_id, "VMwareVMware"))
return 1; return 1;
} else if (dmi_available && dmi_name_in_vendors("VMware") && } else if (dmi_available && dmi_name_in_serial("VMware") &&
__vmware_platform()) __vmware_platform())
return 1; return 1;

11
drivers/firmware/dmi_scan.c
View file

@ -467,6 +467,17 @@ const char *dmi_get_system_info(int field)
} }
EXPORT_SYMBOL(dmi_get_system_info); EXPORT_SYMBOL(dmi_get_system_info);
/**
* dmi_name_in_serial - Check if string is in the DMI product serial
* information.
*/
int dmi_name_in_serial(const char *str)
{
int f = DMI_PRODUCT_SERIAL;
if (dmi_ident[f] && strstr(dmi_ident[f], str))
return 1;
return 0;
}
/** /**
* dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information. * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information.

2
include/linux/dmi.h
View file

@ -44,6 +44,7 @@ extern const struct dmi_device * dmi_find_device(int type, const char *name,
extern void dmi_scan_machine(void); extern void dmi_scan_machine(void);
extern int dmi_get_year(int field); extern int dmi_get_year(int field);
extern int dmi_name_in_vendors(const char *str); extern int dmi_name_in_vendors(const char *str);
extern int dmi_name_in_serial(const char *str);
extern int dmi_available; extern int dmi_available;
extern int dmi_walk(void (*decode)(const struct dmi_header *)); extern int dmi_walk(void (*decode)(const struct dmi_header *));
@ -56,6 +57,7 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na
static inline void dmi_scan_machine(void) { return; } static inline void dmi_scan_machine(void) { return; }
static inline int dmi_get_year(int year) { return 0; } static inline int dmi_get_year(int year) { return 0; }
static inline int dmi_name_in_vendors(const char *s) { return 0; } static inline int dmi_name_in_vendors(const char *s) { return 0; }
static inline int dmi_name_in_serial(const char *s) { return 0; }
#define dmi_available 0 #define dmi_available 0
static inline int dmi_walk(void (*decode)(const struct dmi_header *)) static inline int dmi_walk(void (*decode)(const struct dmi_header *))
{ return -1; } { return -1; }