X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=9479e2bb01ef426b457b5c6b65ed1077c0694462;hb=4f65d7ae7fd62f2a52735c7b69fe1da65b9fed9f;hp=d90715c55689a6bb7d0094b7da44b052c8e7a666;hpb=b35cb9f7d22a06d849820c8d4487c66f74ec42e2;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index d90715c..9479e2b 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -62,8 +62,7 @@ endif
 
 
 ifeq ($(DEBUG_ALL),1)
-  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
+  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_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
 
 
@@ -73,6 +72,14 @@ else
 ifeq ($(DEBUG_SHADOW_PAGING),0) 
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_SHADOW_PAGING
 endif
+
+endif
+ifeq ($(DEBUG_NESTED_PAGING),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NESTED_PAGING
+else 
+ifeq ($(DEBUG_NESTED_PAGING),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NESTED_PAGING
+endif
 endif
 
 ifeq ($(DEBUG_CTRL_REGS),1)
@@ -187,6 +194,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_APIC
 endif
 endif
 
+ifeq ($(DEBUG_PCI),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PCI
+else 
+ifeq ($(DEBUG_PCI),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PCI
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -263,6 +278,7 @@ VMM_OBJS := \
 	palacios/vmm_debug.o \
 	palacios/svm_io.o \
 	palacios/vmm_intr.o \
+	palacios/vmm_excp.o \
 	palacios/vmm_time.o \
 	palacios/vmm_shadow_paging.o \
 	palacios/vm_guest_mem.o \
@@ -426,6 +442,7 @@ CC_GENERAL_OPTS = \
 	-I$(PROJECT_ROOT)/include \
 	-Werror \
 	-fPIC \
+	-mno-red-zone \
 	-Wp,-MD,$(@D)/.$(@F).d \
 	-Wp,-MT,$@ \
 
@@ -519,13 +536,7 @@ vgabios_link:
 	ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
 
-force_rombios: rombios_link
-	(cd ../src/vmboot/rombios; make clean; make)
-
-force_vgabios: vgabios_link
-	(cd ../src/vmboot/vgabios; make clean; make)
-
-force_payload: force_rombios force_vgabios
+force_payload: rombios_link vgabios_link
 	../scripts/make_payload.pl payload_layout.txt vm_kernel
 
 inter1: force_payload