added initial attempt at emulator

[palacios-OLD.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8712934..6a17541 100644 (file)
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -62,9 +62,11 @@ endif
 
 
 ifeq ($(DEBUG_ALL),1)
-  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC -DDEBUG_RAMDISK -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
+  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
+# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK
 endif
 
+
 ifeq ($(DEBUG_SHADOW_PAGING),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING
 else 
@@ -227,7 +229,7 @@ endif
 # List of targets to build by default.
 # These targets encompass everything needed to boot
 # and run GeekOS.
-ALL_TARGETS := vmm vm_kernel
+ALL_TARGETS := vmm force_payload
 
 
 VMM_OBJS := \
@@ -260,6 +262,9 @@ VMM_OBJS := \
        palacios/vmm_queue.o \
        palacios/vmm_host_events.o \
        palacios/svm_lowlevel.o \
+       palacios/vmm_msr.o \
+       palacios/svm_msr.o \
+       palacios/vmm_socket.o \
 
 #              vmx.c vmcs_gen.c vmcs.c