Print E820 type names as well as numbers, as a debug aid
authorIan Campbell <ian.campbell@citrix.com>
Fri, 13 May 2011 15:30:55 +0000 (16:30 +0100)
committerKevin O'Connor <kevin@koconnor.net>
Sat, 14 May 2011 13:03:50 +0000 (09:03 -0400)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
src/memmap.c

index ea05953def3568e48f84d107bba63a444dd6139b..20ccae0d4909fe291e87634b32231d1e1d89d5a6 100644 (file)
@@ -40,6 +40,20 @@ insert_e820(int i, u64 start, u64 size, u32 type)
     e->type = type;
 }
 
+static const char *
+e820_type_name(u32 type)
+{
+       switch (type) {
+       case E820_RAM:      return "RAM";
+       case E820_RESERVED: return "RESERVED";
+       case E820_ACPI:     return "ACPI";
+       case E820_NVS:      return "NVS";
+       case E820_UNUSABLE: return "UNUSABLE";
+       case E820_HOLE:     return "HOLE";
+       default:            return "UNKNOWN";
+       }
+}
+
 // Show the current e820_list.
 static void
 dump_map(void)
@@ -49,10 +63,10 @@ dump_map(void)
     for (i=0; i<e820_count; i++) {
         struct e820entry *e = &e820_list[i];
         u64 e_end = e->start + e->size;
-        dprintf(1, "  %d: %08x%08x - %08x%08x = %d\n", i
+        dprintf(1, "  %d: %08x%08x - %08x%08x = %d %s\n", i
                 , (u32)(e->start >> 32), (u32)e->start
                 , (u32)(e_end >> 32), (u32)e_end
-                , e->type);
+                , e->type, e820_type_name(e->type));
     }
 }