vmm: Refactor vmm_ctl to use error()
[akaros.git] / kern / src / manager.c
index cd3c5bf..9004b21 100644 (file)
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <monitor.h>
-#include <colored_caches.h>
 #include <string.h>
 #include <pmap.h>
 #include <arch/console.h>
@@ -42,7 +41,7 @@ void manager(void)
        #define MANAGER_FUNC(dev) PASTE(manager_,dev)
 
        #if !defined(DEVELOPER_NAME) && \
-           (defined(CONFIG_KERNEL_POSTBOOT_TESTING) || \
+           (defined(CONFIG_KERNEL_TESTING) || \
             defined(CONFIG_USERSPACE_TESTING))
                #define DEVELOPER_NAME jenkins
        #endif
@@ -113,7 +112,7 @@ void manager_brho(void)
        static bool first = TRUE;
        struct per_cpu_info *pcpui = &per_cpu_info[core_id()];
 
-       if (first) {    
+       if (first) {
                printk("*** IRQs must be enabled for input emergency codes ***\n");
                #ifdef CONFIG_X86
                printk("*** Hit ctrl-g to enter the monitor. ***\n");
@@ -181,7 +180,6 @@ void manager_brho(void)
                                spin_unlock(&p->proc_lock);
                                udelay(5000000);
                                printk("Killing p\n");
-                               enable_irq();
                                proc_destroy(p);
                                printk("Killed p\n");
                        panic("This is okay");
@@ -223,7 +221,7 @@ void manager_brho(void)
 }
 
 void manager_jenkins()
-{ 
+{
        #ifdef CONFIG_KERNEL_TESTING
                printk("<-- BEGIN_KERNEL_TESTS -->\n");
                run_registered_ktest_suites();
@@ -273,14 +271,14 @@ void manager_waterman()
 {
        static bool first = true;
        if (first)
-               mon_bb(0, 0, 0);
+               mon_shell(0, 0, 0);
        smp_idle();
        assert(0);
 }
 
 void manager_yuzhu()
 {
-       
+
        static uint8_t progress = 0;
        static struct proc *p;