Merged changes and added CONFIG_V3VEE wrappers

diff --git a/build/Makefile b/build/Makefile
index 65a0aa3..1cfd87d 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -40,6 +40,7 @@
 # ----------------------------------------------------------------------
 PROJECT_ROOT := ..
 PALACIOS_BUILD_DIR := $(PROJECT_ROOT)/palacios/build
+KITTEN_TOP_DIR := $(PROJECT_ROOT)/kitten
 GEEKOS_BUILD_DIR := $(PROJECT_ROOT)/geekos/build
 GUEST_ISO_DIR := /opt/vmm-tools/isos
 
@@ -198,6 +199,12 @@ palacios-full:
 palacios-lean:
        (cd $(PALACIOS_BUILD_DIR) && make LEAN_AND_MEAN=1 world)
 
+kitten: palacios-full
+       cp $(PALACIOS_BUILD_DIR)/libv3vee.a $(KITTEN_TOP_DIR)/palacios/
+       cp $(PALACIOS_BUILD_DIR)/../lib/xed/libxed32e.a $(KITTEN_TOP_DIR)/palacios/
+       cp $(PALACIOS_BUILD_DIR)/vm_kernel $(KITTEN_TOP_DIR)/palacios/
+       (cd $(KITTEN_TOP_DIR) && make oldconfig && make)
+
 
 geekos: 
        cp $(PALACIOS_BUILD_DIR)/libv3vee.a $(GEEKOS_BUILD_DIR)/palacios/

diff --git a/kitten/.hg/dirstate b/kitten/.hg/dirstate
index 23a1d25..2d7cc7f 100644 (file)
Binary files a/kitten/.hg/dirstate and b/kitten/.hg/dirstate differ

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 790ef1e..49a2c04 100644 (file)
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -116,19 +116,12 @@ start_kernel()
                        panic("Failed to boot CPU %d.\n", cpu);
        }
 
-#ifdef CONFIG_V3VEE
-       /*
-        * Start up the V3Vee subsystem
-        */
-       Init_V3( 0, 0 );
-#else
        /*
         * Start up user-space...
         */
        printk(KERN_INFO "Loading initial user-level task (init_task)...\n");
        if ((status = create_init_task()) != 0)
                panic("Failed to create init_task (status=%d).", status);
-#endif
 
        schedule();  /* This should not return */
        BUG();