Changeset 6ce3fcc997931e7903408724b4cade3ed09b1e99

Timestamp:

09/30/09 04:32:42 (2 years ago)

Author:

H. Peter Anvin <hpa@…>

Children:

0d5291acef3054e516603f58e982b0b570217adf

Parents:

1c8d53bf85b1f570d1dc69b1498b880a3ade836a, 633ce833e5be19ee51400e5e5771ffb880c4291a

git-committer:

H. Peter Anvin <hpa@zytor.com> / 2009-09-29T21:32:42Z-0700

Message:

Merge branch 'hdt'

Files:

• com32/gplinclude/cpuid.h (modified) (1 diff)
• com32/gpllib/cpuid.c (modified) (1 diff)
• com32/hdt/hdt-cli-cpu.c (modified) (1 diff)
• com32/hdt/hdt-menu-processor.c (modified) (1 diff)
• com32/include/cpufeature.h (modified) (2 diffs)
• com32/modules/chain.c (modified) (3 diffs)
• com32/modules/cpuidtest.c (modified) (1 diff)
• utils/pxelinux-options (added)

com32/gplinclude/cpuid.h

@@ -66 +66 @@
     bool now;                   /* 3DNow! */
     bool smp;                   /* A smp configuration has been found */
+    bool vmx;                   /* Hardware virtualization */
+    bool svm;                   /* Secure virtual machine */
 } s_cpu_flags;
 

com32/gpllib/cpuid.c

@@ -296 +296 @@
     cpu->flags.now = cpu_has(c, X86_FEATURE_3DNOW);
     cpu->flags.smp = find_smp_config();
+    cpu->flags.vmx = cpu_has(c, X86_FEATURE_VMX);
+    cpu->flags.svm = cpu_has(c, X86_FEATURE_SVM);
 }
 

com32/hdt/hdt-cli-cpu.c

@@ -175 +175 @@
         if (hardware->cpu.flags.now)
                 strcat(buffer1, "3dnow! ");
+        if (hardware->cpu.flags.svm)
+                strcat(buffer1, "svm ");
+        if (hardware->cpu.flags.vmx)
+                strcat(buffer1, "vmx ");
         if (buffer1[0]) {
                 snprintf(buffer, sizeof buffer, "Flags     : %s\n", buffer1);

com32/hdt/hdt-menu-processor.c

@@ -232 +232 @@
   if (hardware->cpu.flags.now)
     strcat(buffer1, "3dnow! ");
+  if (hardware->cpu.flags.vmx)
+    strcat(buffer1, "vmx ");
+  if (hardware->cpu.flags.svm)
+    strcat(buffer1, "svm ");
   snprintf(buffer, sizeof buffer, "Flags     : %s", buffer1);
   snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);

com32/include/cpufeature.h

@@ -73 +73 @@
 #define X86_FEATURE_MWAIT       (4*32+ 3)       /* Monitor/Mwait support */
 #define X86_FEATURE_DSCPL       (4*32+ 4)       /* CPL Qualified Debug Store */
+#define X86_FEATURE_VMX         (4*32+ 5)       /* Hardware virtualization */
 #define X86_FEATURE_EST         (4*32+ 7)       /* Enhanced SpeedStep */
 #define X86_FEATURE_TM2         (4*32+ 8)       /* Thermal Monitor 2 */
@@ -88 +89 @@
 #define X86_FEATURE_LAHF_LM     (6*32+ 0)       /* LAHF/SAHF in long mode */
 #define X86_FEATURE_CMP_LEGACY  (6*32+ 1)       /* If yes HyperThreading not valid */
+#define X86_FEATURE_SVM         (6*32+ 2)       /* Secure virtual machine */
 
 #endif /* __ASM_I386_CPUFEATURE_H */

com32/modules/chain.c

@@ -447 +447 @@
 
     if (!mmap) {
-        error("Cannot read system memory map");
+        error("Cannot read system memory map\n");
         return;
     }
@@ -548 +548 @@
 
 too_big:
-    error("Loader file too large");
+    error("Loader file too large\n");
     return;
 
 enomem:
-    error("Out of memory");
+    error("Out of memory\n");
     return;
 }
@@ -615 +615 @@
             uint32_t segval = strtoul(argv[i] + 4, NULL, 0);
             if (segval < 0x50 || segval > 0x9f000) {
-                error("Invalid segment");
+                error("Invalid segment\n");
                 goto bail;
             }

com32/modules/cpuidtest.c

@@ -122 +122 @@
         if (cpu.flags.now)
             printf("3dnow! ");
+        if (cpu.flags.vmx)
+            printf("vmx ");
+        if (cpu.flags.svm)
+            printf("svm ");
         printf("\n");
         printf("SMP         = ");