X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=c3712a2543326c52f667024c74b5a13cc07ae7a0;hb=701de97007c8b6776998eeab78469a4304f6b871;hp=94011055f5fd88b92a7ddb097ec02af08ae84aa2;hpb=72a450936e2da159d5febe1e96475493badd9070;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 9401105..c3712a2 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.11 $
+# $Revision: 1.14 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -97,8 +97,9 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
 	bget.c malloc.c \
 	synch.c kthread.c \
 	serial.c  reboot.c \
-        paging.c vmx.c vmcs_gen.c vmcs.c\
-	 svm.c vmm.c vmm_util.c \
+        paging.c vmx.c vmcs_gen.c vmcs.c \
+	 svm.c vmm.c vmm_util.c vmm_stubs.c \
+	vmcb.c vmm_mem.c vm_guest.c \
 	debug.c\
 	main.c
 
@@ -268,21 +269,6 @@ pxe:	fd.img
 	$(PAD) /tftpboot/vmm.img 1474560
 
 
-pxe-discovery-pdinda:	fd.img
-	cp fd.img geekos.img
-	$(PAD) geekos.img 1474560
-	/usr/local/vmm-util/pxe_cp geekos.img
-	/usr/local/vmm-util/tty_perm pdinda
-	echo "Copied file to PXE boot area and set serial permissions for pdinda"
-
-
-pxe-discovery-bjp600:	fd.img
-	cp fd.img geekos.img
-	$(PAD) geekos.img 1474560
-	/usr/local/vmm-util/pxe_cp geekos.img
-	/usr/local/vmm-util/tty_perm bjp600
-	echo "Copied file to PXE boot area and set serial permissions for pdinda"
-
 
 # Floppy boot sector (first stage boot loader).
 geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/fd_boot.asm vm_kernel
@@ -350,6 +336,11 @@ vm_kernel: force
 	@echo "VM kernel lives at 0x100000 and is" `$(NUMSECS) vm_kernel` "sectors long"
 
 
+
+vmm_mem_test: geekos/vmm_mem.c
+	$(HOST_CC) -o mem_test -DVMM_MEM_TEST -I../include ../src/geekos/vmm_mem.c 
+
+
 # Clean build directories of generated files
 clean :
 	for d in geekos common libc user tools; do \