X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=34c24f7adbc8d6efbaad854f5098f24024e31c97;hb=b0056428ce1c60d7d9b6ac0a2cd11df597b58a92;hp=4d09399cb47bcf8dfb74743dd237771d4faf268d;hpb=e94507c7055f81abcf6a95132cb7ad90f1b5e6ca;p=palacios.git

diff --git a/linux_module/main.c b/linux_module/main.c
index 4d09399..34c24f7 100644
--- a/linux_module/main.c
+++ b/linux_module/main.c
@@ -90,7 +90,7 @@ static long v3_dev_ioctl(struct file * filp,
 	    struct v3_guest_img user_image;
 	    struct v3_guest * guest = palacios_alloc(sizeof(struct v3_guest));
 
-	    if (IS_ERR(guest)) {
+	    if (!(guest)) {
 		ERROR("Palacios: Error allocating Kernel guest_image\n");
 		return -EFAULT;
 	    }
@@ -118,7 +118,7 @@ static long v3_dev_ioctl(struct file * filp,
 	    DEBUG("Palacios: Allocating kernel memory for guest image (%llu bytes)\n", user_image.size);
 	    guest->img = palacios_valloc(guest->img_size);
 
-	    if (IS_ERR(guest->img)) {
+	    if (!guest->img) {
 		ERROR("Palacios Error: Could not allocate space for guest image\n");
 		goto out_err1;
 	    }
@@ -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,
@@ -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);
 
@@ -571,7 +576,7 @@ static int __init v3_init(void) {
 
 
     v3_class = class_create(THIS_MODULE, "vms");
-    if (IS_ERR(v3_class)) {
+    if (!v3_class || IS_ERR(v3_class)) {
 	ERROR("Failed to register V3 VM device class\n");
 	ret =  PTR_ERR(v3_class);
 	goto failure3;
@@ -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);