echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CPUID: Remove Intel model 2 again, this is spoofed in the VM

Browse Source
This commit is contained in:
zzz
2014-10-07 11:49:51 +00:00
parent 80d0313fe5
commit 55af588c2c
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
View File

@ -166,17 +166,25 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
case 1: case 1:
modelString = "Pentium Pro"; modelString = "Pentium Pro";
break; break;
// Nehalem 45 nm // Spoofed Nehalem by qemu-kvm
// As reported; can't find in any CPUID charts // Not in any CPUID charts
case 2: // KVM bug?
isPentium2Compatible = true; // # cat /usr/share/kvm/cpus-x86_64.conf | grep 'name = "Nehalem"' -B 1 -A 12
isPentium3Compatible = true; // [cpudef]
isPentiumMCompatible = true; // name = "Nehalem"
isCore2Compatible = true; // level = "2"
isCoreiCompatible = true; // vendor = "GenuineIntel"
isX64 = true; // family = "6"
modelString = "Core i7 (45nm)"; // model = "2"
break; // stepping = "3"
// feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
// feature_ecx = "popcnt sse4.2 sse4.1 cx16 ssse3 sse3"
// extfeature_edx = "i64 syscall xd"
// extfeature_ecx = "lahf_lm"
// xlevel = "0x8000000A"
// model_id = "Intel Core i7 9xx (Nehalem Class Core i7)"
//case 2:
// ...
case 3: case 3:
isPentium2Compatible = true; isPentium2Compatible = true;
modelString = "Pentium II (Klamath)"; modelString = "Pentium II (Klamath)";