Remove Linux header file for newer version of Linux kernel

[palacios.git] / linux_module / palacios-stubs.c

diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c
index 21aa4fd..12b4e45 100644 (file)
--- a/linux_module/palacios-stubs.c
+++ b/linux_module/palacios-stubs.c
@@ -36,6 +36,9 @@ static struct v3_vm_info * irq_to_guest_map[256];
 
 extern unsigned int cpu_khz;
 
+extern int cpu_list[NR_CPUS];
+extern int cpu_list_len;
+
 
 /**
  * Prints a message to the console.
@@ -155,6 +158,7 @@ palacios_xcall(
 struct lnx_thread_arg {
     int (*fn)(void * arg);
     void * arg;
+    char * name;
 };
 
 static int lnx_thread_target(void * arg) {
@@ -173,6 +177,9 @@ static int lnx_thread_target(void * arg) {
     kfree(thread_info);
     // handle cleanup 
 
+    
+    printk("Palacios Thread (%s) EXITTING\n", thread_info->name);
+
     do_exit(ret);
     
     return 0; // should not get here.
@@ -191,6 +198,7 @@ palacios_start_kernel_thread(
 
     thread_info->fn = fn;
     thread_info->arg = arg;
+    thread_info->name = thread_name;
 
     return kthread_run( lnx_thread_target, thread_info, thread_name );
 }
@@ -209,6 +217,7 @@ palacios_start_thread_on_cpu(int cpu_id,
 
     thread_info->fn = fn;
     thread_info->arg = arg;
+    thread_info->name = thread_name;
 
 
     thread = kthread_create( lnx_thread_target, thread_info, thread_name );
@@ -218,7 +227,11 @@ palacios_start_thread_on_cpu(int cpu_id,
        return NULL;
     }
 
-    set_cpus_allowed_ptr(thread, cpumask_of(cpu_id));
+    if (set_cpus_allowed_ptr(thread, cpumask_of(cpu_id)) != 0) {
+       kthread_stop(thread);
+       return NULL;
+    }
+
     wake_up_process(thread);
 
     return thread;
@@ -492,12 +505,35 @@ static struct v3_os_hooks palacios_os_hooks = {
 
 int palacios_vmm_init( void )
 {
+    int num_cpus = num_online_cpus();
+    char * cpu_mask = NULL;
+
+    if (cpu_list_len > 0) {
+       int major = 0;
+       int minor = 0;
+       int i = 0;
+
+        cpu_mask = kmalloc((num_cpus / 8) + 1, GFP_KERNEL);
+       memset(cpu_mask, 0, (num_cpus / 8) + 1);
+        
+        for (i = 0; i < cpu_list_len; i++) {
+           if (cpu_list[i] >= num_cpus) {
+               printk("CPU (%d) exceeds number of available CPUs. Ignoring...\n", cpu_list[i]);
+               continue;
+           }
+
+            major = cpu_list[i] / 8;
+            minor = cpu_list[i] % 8;
     
+            *(cpu_mask + major) |= (0x1 << minor);
+        }
+    }
+
     memset(irq_to_guest_map, 0, sizeof(struct v3_vm_info *) * 256);
-    
+
     printk("palacios_init starting - calling init_v3\n");
     
-    Init_V3(&palacios_os_hooks, num_online_cpus());
+    Init_V3(&palacios_os_hooks, cpu_mask, num_cpus);
 
     return 0;