X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=46fcc407a052e072ac268cabf768a70f79594dff;hb=4659d019e2f65b9397e2289a9add28a3adf47cf8;hp=6d62c0b808878af77e704b1749cbb1cd1f82e796;hpb=6fe0528310bec884ed00c8d97b45d18120a32e3f;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 6d62c0b..46fcc40 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -62,7 +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
+  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_IDE
 endif
 
@@ -73,6 +73,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)
@@ -263,6 +271,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 \
@@ -322,6 +331,7 @@ DEVICES_OBJS := \
 	devices/para_net.o \
 	devices/ide.o \
 	devices/ram_cd.o \
+	devices/ram_hd.o \
 
 #	devices/cdrom.o \
 #	devices/ramdisk.o \
@@ -522,13 +532,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