X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=932b739df96e72174f6c8a4ebb7458d30dbf000b;hb=b07dd4e35a37f1db04c4f52f9904ee7206673ac6;hp=99ec9e8c420b6510a71393e65e6612859433c89a;hpb=e8e3ec0355b791d6f729df796d0155bccca85090;p=palacios.git

diff --git a/linux_module/main.c b/linux_module/main.c
index 99ec9e8..932b739 100644
--- a/linux_module/main.c
+++ b/linux_module/main.c
@@ -355,8 +355,9 @@ static int read_guests_details(struct seq_file *s, void *v)
 
 		seq_printf(s, "\nMemory Regions\n");
 		for (j=0;j<mem->num_regions;j++) { 
-		    seq_printf(s,"   region %u has HPAs 0x%p-0x%p\n",
-			       j, mem->region[j].host_paddr, mem->region[j].host_paddr+mem->region[j].size);
+		    seq_printf(s,"   region %u has HPAs 0x%p-0x%p (node %d)\n",
+			       j, mem->region[j].host_paddr, mem->region[j].host_paddr+mem->region[j].size,
+			       numa_addr_to_node((uintptr_t)(mem->region[j].host_paddr)));
 		}
 	    }
 	    seq_printf(s,
@@ -481,7 +482,7 @@ static int read_info(struct seq_file *s, void *v)
     if (!v3_lookup_option("mem_block_size")) { 
 	mem_block_size = V3_CONFIG_MEM_BLOCK_SIZE;
     } else {
-	if (kstrtoull(v3_lookup_option("mem_block_size"), 0, &mem_block_size)) {
+	if (strict_strtoull(v3_lookup_option("mem_block_size"), 0, &mem_block_size)) {
 	    // huh?
 	    mem_block_size=-1;
 	}
@@ -563,6 +564,10 @@ static int __init v3_init(void) {
       palacios_allow_devmem();
     }
 
+    // numa is now a required interface and we need it
+    // up before primary initiatilization
+    palacios_init_numa();
+
     // Initialize Palacios
     palacios_vmm_init(options);
 
@@ -695,6 +700,8 @@ static void __exit v3_exit(void) {
 
     palacios_vmm_exit();
 
+    palacios_deinit_numa();
+
     DEBUG("Palacios Mallocs = %d, Frees = %d\n", mallocs, frees);
     DEBUG("Palacios Vmallocs = %d, Vfrees = %d\n", vmallocs, vfrees);
     DEBUG("Palacios Page Allocs = %d, Page Frees = %d\n", pg_allocs, pg_frees);