From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 21 Oct 2008 20:40:15 +0000 (-0500)
Subject: Merge branch 'kitten' of ssh://sharedev@newskysaw.cs.northwestern.edu/home/sharedev... 
X-Git-Tag: 1.0^2~30^2~10
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=a082ab2a20b41b67c9ecf81e69e50c0b0d37f49d;hp=04977d080b9850506ced2523b6130abc517b61df;p=palacios-OLD.git

Merge branch 'kitten' of ssh://sharedev@newskysaw.cs.northwestern.edu/home/sharedev/palacios into kitten
---

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...
 	 */
diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 2f26400..4708cc1 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -212,12 +212,12 @@ struct v3_os_hooks {
   int (*ack_irq)(int irq);
 
 
-  unsigned int (*get_cpu_khz)();
+  unsigned int (*get_cpu_khz)(void);
 
 
-  void (*start_kernel_thread)(); // include pointer to function
+  void (*start_kernel_thread)(void); // include pointer to function
 
-  void (*yield_cpu)();
+  void (*yield_cpu)(void);
 
 };
 
@@ -233,14 +233,14 @@ struct v3_vm_config {
 
 /* This will contain Function pointers that control the VMs */
 struct v3_ctrl_ops {
-  struct guest_info *(*allocate_guest)();
+  struct guest_info *(*allocate_guest)(void);
 
   int (*config_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
   int (*init_guest)(struct guest_info * info);
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
 
-  int (*has_nested_paging)();
+  int (*has_nested_paging)(void);
 
   //  v3_cpu_arch_t (*get_cpu_arch)();
 };