From: Kevin Pedretti <ktpedre@sandia.gov>
Date: Tue, 21 Oct 2008 20:39:26 +0000 (-0500)
Subject: Link in palacios
X-Git-Tag: 1.0^2~30^2~10^2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=07c81e9a7c58c1b7f4adce4e3db04d5aa65993d6

Link in palacios
---

diff --git a/kitten/Makefile b/kitten/Makefile
index e108ed0..99507c0 100644
--- a/kitten/Makefile
+++ b/kitten/Makefile
@@ -301,6 +301,7 @@ AFLAGS_KERNEL	=
 # Use LWKINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LWKINCLUDE      := -Iinclude \
+		   -I../palacios/include \
                    $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
 		   -include include/lwk/autoconf.h
 
@@ -548,9 +549,8 @@ libs-y1		:= $(patsubst %/, %/lib.a, $(libs-y))
 libs-y2		:= $(patsubst %/, %/built-in.o, $(libs-y))
 libs-y		:= $(libs-y1) $(libs-y2)
 
-libs-$(CONFIG_V3VEE) += ../palacios/build/libv3vee.a
-libs-$(CONFIG_V3VEE) += ../palacios/lib/xed/libxed32e.a
-libs-$(CONFIG_V3VEE) += ../palacios/lib/xed/libxed.a
+libs-$(CONFIG_V3VEE) += palacios/libv3vee.a
+libs-$(CONFIG_V3VEE) += palacios/libxed32e.a
 
 # Build vmlwk
 # ---------------------------------------------------------------------------
diff --git a/kitten/init/main.c b/kitten/init/main.c
index 49a2c04..cf8ada0 100644
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -13,6 +13,8 @@
 #include <lwk/sched.h>
 #include <lwk/timer.h>
 
+#include <palacios/vmm.h>
+
 /**
  * Pristine copy of the LWK boot command line.
  */
@@ -116,6 +118,19 @@ start_kernel()
 			panic("Failed to boot CPU %d.\n", cpu);
 	}
 
+        {
+  struct v3_os_hooks os_hooks;
+  struct v3_ctrl_ops v3_ops;
+  struct guest_info * vm_info = 0;
+  struct v3_vm_config vm_config;
+
+  memset(&os_hooks, 0, sizeof(struct v3_os_hooks));
+  memset(&v3_ops, 0, sizeof(struct v3_ctrl_ops));
+  memset(&vm_config, 0, sizeof(struct v3_vm_config));
+
+  Init_V3(&os_hooks, &v3_ops);
+        }
+
 	/*
 	 * Start up user-space...
 	 */