From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Fri, 30 May 2008 20:34:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: boot386puppy-26-to-ide~30
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=472dec28ebae078e8bf90ff48d1693c1ef8a7b85

*** empty log message ***
---

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 51413b6..4151515 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.36 $
+# $Revision: 1.37 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -295,13 +295,15 @@ vmm.img : fd.img
 	$(PAD) vmm.img 1474560
 
 force_rombios: 
-	(cd ../src/vmboot/rombios; make)
-	cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
+	(cd ../src/vmboot/rombios; make clean; make)
+#	cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
 
+force_vgabios:
+	(cd ../src/vmboot/vgabios; make clean; make)
 
-world: force_rombios
+world: force_rombios force_vgabios
 	../scripts/make_payload.pl payload_layout.txt vm_kernel
-	make clean
+	- make clean
 	make vmm.img
 
 # make ready to boot over PXE
diff --git a/palacios/build/rombios b/palacios/build/rombios
deleted file mode 100644
index e5abff4..0000000
Binary files a/palacios/build/rombios and /dev/null differ
diff --git a/palacios/build/vgabios b/palacios/build/vgabios
deleted file mode 100644
index 36a678d..0000000
Binary files a/palacios/build/vgabios and /dev/null differ
diff --git a/palacios/build/vm_kernel b/palacios/build/vm_kernel
deleted file mode 100755
index 8472a30..0000000
Binary files a/palacios/build/vm_kernel and /dev/null differ
diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 39939a1..dfbe0e8 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -2,7 +2,7 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_util.h>
 
-extern struct vmm_os_hooks * os_hooks;
+
 
 
 void init_shadow_region(shadow_region_t * entry,
@@ -23,7 +23,7 @@ int add_shadow_region_passthrough( struct guest_info *  guest_info,
 				   addr_t               guest_addr_end,
 				   addr_t               host_addr_start)
 {
-  shadow_region_t * entry = os_hooks->malloc(sizeof(shadow_region_t));
+  shadow_region_t * entry = (shadow_region_t *)V3_Malloc(sizeof(shadow_region_t));
 
   init_shadow_region(entry, guest_addr_start, guest_addr_end, 
 		     GUEST_REGION_PHYSICAL_MEMORY, HOST_REGION_PHYSICAL_MEMORY);