X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-dev.c;h=f019e186535d6dc03bb3ced9565adb8c02496d82;hb=ec8e7606831a6768d67c47ca8f48119af64f3453;hp=e1143f89f34ea6d3300cab4d0a7f25198cdfdf94;hpb=78b4d66e80a8168e3ea0059583c3fe998b2bb988;p=palacios.git

diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c
index e1143f8..f019e18 100644
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -28,8 +28,8 @@
 #include "palacios-vnet.h"
 #include "palacios-packet.h"
 
-#ifdef CONFIG_DEBUG_FS
-#include "palacios-debugfs.h"
+#ifdef V3_CONFIG_EXT_INSPECTOR
+#include "palacios-inspector.h"
 #endif
 
 MODULE_LICENSE("GPL");
@@ -138,7 +138,25 @@ static long v3_dev_ioctl(struct file * filp,
 	    init_completion(&(guest->start_done));
 	    init_completion(&(guest->thread_done));
 
-	    kthread_run(start_palacios_vm, guest, guest->name);
+	    { 
+		struct task_struct * launch_thread = NULL;
+		// At some point we're going to want to allow the user to specify a CPU mask
+		// But for now, well just launch from the local core, and rely on the global cpu mask
+
+		preempt_disable();
+		launch_thread = kthread_create(start_palacios_vm, guest, guest->name);
+		
+		if (IS_ERR(launch_thread)) {
+		    preempt_enable();
+		    printk("Palacios error creating launch thread for vm (%s)\n", guest->name);
+		    return -EFAULT;
+		}
+
+		kthread_bind(launch_thread, smp_processor_id());
+		preempt_enable();
+
+		wake_up_process(launch_thread);
+	    }
 
 	    wait_for_completion(&(guest->start_done));
 
@@ -162,14 +180,6 @@ static long v3_dev_ioctl(struct file * filp,
 		return -EFAULT;
 	    }
 
-	    // Mem test...
-	    /*
-	      {
-	      void * vaddr = __va(alloc_palacios_pgs(131072, 4096));
-	      memset(vaddr, 0xfe492fe2, mem.num_pages * 4096);
-	      }
-	    */
-
 	    break;
 	}
 
@@ -241,24 +251,31 @@ static int __init v3_init(void) {
     
     palacios_vmm_init();
 
+#ifdef V3_CONFIG_STREAM
     palacios_init_stream();
+#endif
+
+#ifdef V3_CONFIG_FILE
     palacios_file_init();
-    palacios_init_console();
+#endif
 
+#ifdef V3_CONFIG_CONSOLE
+    palacios_init_console();
+#endif
 
-#ifdef CONFIG_DEBUG_FS
-    palacios_init_debugfs();
+#ifdef V3_CONFIG_EXT_INSPECTOR
+    palacios_init_inspector();
 #endif
 
-#ifdef CONFIG_PALACIOS_SOCKET
+#ifdef V3_CONFIG_SOCKET
     palacios_socket_init();
 #endif
 
-#ifdef CONFIG_PALACIOS_PACKET
+#ifdef V3_CONFIG_PACKET
     palacios_init_packet(NULL);
 #endif
 
-#ifdef CONFIG_PALACIOS_VNET
+#ifdef V3_CONFIG_VNET
     palacios_init_vnet();
 #endif
 
@@ -303,12 +320,17 @@ static void __exit v3_exit(void) {
 
 
 
-#ifdef CONFIG_DEBUG_FS
-    palacios_deinit_debugfs();
+#ifdef V3_CONFIG_EXT_INSPECTOR
+    palacios_deinit_inspector();
 #endif
 
+#ifdef V3_CONFIG_FILE
     palacios_file_deinit();
+#endif
+
+#ifdef V3_CONFIG_STREAM
     palacios_deinit_stream();
+#endif
 
     palacios_deinit_mm();