Changeset 5f2c9a20039de2af5afbd7151734e3a682f19a6f

Timestamp:

01/08/12 01:00:06 (5 months ago)

Author:

Pierre-Alexandre Meyer <pierre@…>

Children:

aba875a3022964cc9f8916abe79adfb70cb5fdbd

Parents:

7b959f267919bf03eb14435c645b74a1bda98a17, 442c60166a9165e4253fd091aba92c04c699017d

git-committer:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2012-01-08T01:00:06Z+0000

Message:

Merge branch 'master' of  git://git.zytor.com/users/erwan/hdt

Location:

com32

Files:

• lua/src/Makefile (modified) (1 diff)
• lua/src/dhcp.c (added)
• lua/src/dhcp.h (added)
• lua/src/linit.c (modified) (1 diff)
• lua/src/lualib.h (modified) (1 diff)
• modules/ifcpu.c (modified) (4 diffs)

com32/lua/src/Makefile

@@ -45 +45 @@
 LIBLUA_OBJS += pci.o
 LIBLUA_OBJS += vesa.o
+LIBLUA_OBJS += dhcp.o
 
 CFLAGS += -DLUA_ANSI

com32/lua/src/linit.c

@@ -34 +34 @@
   {LUA_SYSLINUXLIBNAME, luaopen_syslinux},
   {LUA_VESALIBNAME, luaopen_vesa},
+  {LUA_DHCPLIBNAME, luaopen_dhcp},
 #endif
   {NULL, NULL}

com32/lua/src/lualib.h

@@ -55 +55 @@
 #define LUA_CPULIBNAME  "cpu"
 LUALIB_API int (luaopen_cpu) (lua_State *L);
+
+#define LUA_DHCPLIBNAME "dhcp"
+LUALIB_API int (luaopen_dhcp) (lua_State *L);
 #endif
 

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;