Changeset 287de3be5708ee186a1b1f9fffbdeab66b261383

Timestamp:

01/07/12 16:08:02 (5 months ago)

Author:

Erwan Velu <erwanaliasr1@…>

Children:

442c60166a9165e4253fd091aba92c04c699017d

Parents:

8f44f565ce1ff017d8e1b071fcd73d8ac409ff57

git-committer:

Erwan Velu <erwanaliasr1@gmail.com> / 2012-01-07T17:08:02Z+0100

Message:

ifcpu: Adding hypervisor support

This simple hack add the ability to detect the hypervisor presence.

Files:

• com32/modules/ifcpu.c (modified) (4 diffs)

com32/modules/ifcpu.c

@@ -50 +50 @@
  "\n"
  "cpu_features could be:\n"
- "   64        : Processor is x86_64 compatible (lm cpu flag)\n"
- "   hvm       : Processor features hardware virtualization (hvm or svm cpu flag)\n"
- "   multicore : Processor must be multi-core \n"
- "   smp       : System must be multi-processor \n"
- "   pae       : Processor features Physical Address Extension (PAE)\n"
+ "   64         : Processor is x86_64 compatible (lm cpu flag)\n"
+ "   hvm        : Processor features hardware virtualization (hvm or svm cpu flag)\n"
+ "   multicore  : Processor must be multi-core \n"
+ "   smp        : System must be multi-processor \n"
+ "   pae        : Processor features Physical Address Extension (PAE)\n"
+ "   hypervisor : Processor is running under an hypervisor\n"
  "\n"
  "if you want to match many cpu features, just separate them with a single space.\n");
@@ -115 +116 @@
         } else if (!strcmp(argv[i], "64")) {
             if (debug)
-                printf(" 64bit     : %s on this system\n",
+                printf(" 64bit      : %s on this system\n",
                        show_bool(cpu.flags.lm));
             hardware_matches = cpu.flags.lm && hardware_matches;
         } else if (!strcmp(argv[i], "pae")) {
             if (debug)
-                printf(" pae       : %s on this system\n",
+                printf(" pae        : %s on this system\n",
                        show_bool(cpu.flags.pae));
             hardware_matches = cpu.flags.pae && hardware_matches;
         } else if (!strcmp(argv[i], "hvm")) {
             if (debug)
-                printf(" hvm       : %s on this system\n",
+                printf(" hvm        : %s on this system\n",
                        show_bool((cpu.flags.vmx || cpu.flags.svm)));
             hardware_matches = (cpu.flags.vmx || cpu.flags.svm)
@@ -131 +132 @@
         } else if (!strcmp(argv[i], "multicore")) {
             if (debug)
-                printf(" multicore : %d cores on this system\n", cpu.num_cores);
+                printf(" multicore  : %d cores on this system\n", cpu.num_cores);
             if (cpu.num_cores > 1)
                 multicore = true;
@@ -137 +138 @@
         } else if (!strcmp(argv[i], "smp")) {
             if (debug)
-                printf(" smp       : %s on this system\n", show_bool(cpu.flags.smp));
+                printf(" smp        : %s on this system\n", show_bool(cpu.flags.smp));
             hardware_matches = cpu.flags.smp && hardware_matches;
+        } else if (!strcmp(argv[i], "hypervisor")) {
+            if (debug)
+                printf(" hypervisor : %s on this system\n", show_bool(cpu.flags.hypervisor));
+            hardware_matches = cpu.flags.hypervisor && hardware_matches;
         } else if (!strcmp(argv[i], "dry-run")) {
             dryrun = true;