Added <lwk/palacios.h> header for all users of the V3VEE library to include.

Safe to include even if CONFIG_V3VEE is not defined.
Print out debugging info on the ROM Bios location.

diff --git a/kitten/Makefile b/kitten/Makefile
index 99507c0..2a43e80 100644 (file)
--- a/kitten/Makefile
+++ b/kitten/Makefile
@@ -301,7 +301,6 @@ 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
 
@@ -497,6 +496,11 @@ ifdef CONFIG_DEBUG_INFO
 CFLAGS         += -g
 endif
 
+ifdef CONFIG_V3VEE
+CFLAGS += -I../palacios/include
+endif
+
+
 include $(srctree)/arch/$(ARCH)/Makefile
 
 # arch Makefile may override CC so keep this after arch Makefile is included

diff --git a/kitten/include/lwk/palacios.h b/kitten/include/lwk/palacios.h
new file mode 100644 (file)
index 0000000..fb3fa5b
--- /dev/null
+++ b/kitten/include/lwk/palacios.h
@@ -0,0 +1,15 @@
+/* Copyright (c) 2007,2008 Sandia National Laboratories */
+
+#ifndef _LWK_PALACIOS_H_
+#define _LWK_PALACIOS_H_
+
+#ifdef CONFIG_V3VEE
+
+#include <palacios/vmm.h>
+
+extern uint8_t rombios_start, rombios_end;
+extern uint8_t vgabios_start, vgabios_end;
+
+#endif // CONFIG_V3VEE
+
+#endif

diff --git a/kitten/init/main.c b/kitten/init/main.c
index cf8ada0..e235721 100644 (file)
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -12,8 +12,7 @@
 #include <lwk/task.h>
 #include <lwk/sched.h>
 #include <lwk/timer.h>
-
-#include <palacios/vmm.h>
+#include <lwk/palacios.h>
 
 /**
  * Pristine copy of the LWK boot command line.
@@ -118,6 +117,7 @@ start_kernel()
                        panic("Failed to boot CPU %d.\n", cpu);
        }
 
+#ifdef CONFIG_V3VEE
         {
   struct v3_os_hooks os_hooks;
   struct v3_ctrl_ops v3_ops;
@@ -128,8 +128,19 @@ start_kernel()
   memset(&v3_ops, 0, sizeof(struct v3_ctrl_ops));
   memset(&vm_config, 0, sizeof(struct v3_vm_config));
 
+       printk( KERN_INFO "Calling Init_V3\n" );
   Init_V3(&os_hooks, &v3_ops);
+       printk( KERN_INFO "Rombios: %p @ %d\n",
+               &rombios_start,
+               &rombios_end - &rombios_start,
+       );
+
+       printk( KERN_INFO "VGA Bios: %p @ %d\n",
+               &vgabios_start,
+               &vgabios_end - &vgabios_start
+       );
         }
+#endif
 
        /*
         * Start up user-space...