added memory conversions and copies for the guest/host contexts

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index a82b6cc..7a42b22 100644 (file)
--- 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.15 $
+# $Revision: 1.20 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -84,10 +84,11 @@ 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 vmm_stubs.c \
-       vmcb.c vmm_mem.c vm_guest.c vmm_paging.c \
-       debug.c\
+        paging.c  vm_guest.c \
+        svm.c svm_handler.c vmm.c vmm_util.c vmm_stubs.c svm_ctrl_regs.c \
+       vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c \
+       vmm_shadow_paging.c vm_guest_mem.c \
+       debug.c  vmx.c vmcs_gen.c vmcs.c\
        main.c
 
 # Kernel object files built from C source files
@@ -182,7 +183,7 @@ NUMSECS := $(PERL) $(PROJECT_ROOT)/scripts/numsecs
 # ----------------------------------------------------------------------
 
 # Flags used for all C source files
-GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS)
+GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS) -fPIC
 CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror 
 
 # Flags used for kernel C source files
@@ -300,7 +301,7 @@ vm_kernel: force
 
 
 vmm_mem_test: geekos/vmm_mem.c
-       $(HOST_CC) -m32 -o mem_test -DVMM_MEM_TEST -I../include ../src/geekos/vmm_mem.c ../src/geekos/vmm_paging.c 
+       $(HOST_CC) -m32 -o mem_test -DVMM_MEM_TEST -I../include ../src/geekos/vmm_mem.c 
 
 
 # Clean build directories of generated files