Make cutmem accept a region specification.

	Suggested by: Samuel Thibault

	* grub-core/mmap/mmap.c (parsemem): New function.
	(grub_cmd_cutmem): Handle new arguments.

diff --git a/ChangeLog b/ChangeLog
index 40f017bb9ba007be65dbf131c6f4197e35b6ba55..9951f59799888474e863fa7a495fa4be64ae7e2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Make cutmem accept a region specification.
+       Suggested by: Samuel Thibault
+
+       * grub-core/mmap/mmap.c (parsemem): New function.
+       (grub_cmd_cutmem): Handle new arguments.
+
 2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        New command cutmem.

diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
index 4f5fad70505e15e436b28c162ba934fa00ba804f..1c18254903d56c874701cd27e96dfe42286efbd1 100644 (file)
--- a/grub-core/mmap/mmap.c
+++ b/grub-core/mmap/mmap.c
@@ -398,12 +398,33 @@ grub_cmd_badram (grub_command_t cmd __attribute__ ((unused)),
     }
 }
 
+static grub_uint64_t
+parsemem (const char *str)
+{
+  grub_uint64_t ret;
+  char *ptr;
+
+  ret = grub_strtoul (str, &ptr, 0);
+
+  switch (*ptr)
+    {
+    case 'K':
+      return ret << 10;
+    case 'M':
+      return ret << 20;
+    case 'G':
+      return ret << 30;
+    case 'T':
+      return ret << 40;
+    }
+  return ret;
+}
+
 static grub_err_t
 grub_cmd_cutmem (grub_command_t cmd __attribute__ ((unused)),
                 int argc, char **args)
 {
-  grub_uint64_t cutmem;
-  char *ptr;
+  grub_uint64_t from, to;
 
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
                                 grub_memory_type_t);
@@ -413,36 +434,29 @@ grub_cmd_cutmem (grub_command_t cmd __attribute__ ((unused)),
   {
     grub_uint64_t end = addr + size;
 
-    if (end >= cutmem)
+    if (addr <= from)
+      addr = from;
+    if (end >= to)
+      end = to;
+
+    if (end <= addr)
       return 0;
-    if (addr < cutmem)
-      addr = cutmem;
 
     grub_mmap_register (addr, end - addr, GRUB_MEMORY_HOLE);
     return 0;
   }
 
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "number required");
+  if (argc != 2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "argements required");
 
-  cutmem = grub_strtoul (args[0], &ptr, 0);
+  from = parsemem (args[0]);
   if (grub_errno)
     return grub_errno;
-  switch (*ptr)
-    {
-    case 'K':
-      cutmem <<= 10;
-      break;
-    case 'M':
-      cutmem <<= 20;
-      break;
-    case 'G':
-      cutmem <<= 30;
-      break;
-    case 'T':
-      cutmem <<= 40;
-      break;
-    }
+
+  to = parsemem (args[1]);
+  if (grub_errno)
+    return grub_errno;
+
   grub_mmap_iterate (hook);
 
   return GRUB_ERR_NONE;
@@ -457,8 +471,8 @@ GRUB_MOD_INIT(mmap)
                               N_("ADDR1,MASK1[,ADDR2,MASK2[,...]]"),
                               N_("Declare memory regions as badram."));
   cmd_cut = grub_register_command ("cutmem", grub_cmd_cutmem,
-                                  N_("ADDR[K|M|G]"),
-                                  N_("Remove any memory regions above ADDR."));
+                                  N_("FROM[K|M|G] TO[K|M|G]"),
+                                  N_("Remove any memory regions in specified range."));
 
 }