X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=d37357918e37f418dff0dbc9f4357ea3ef48f76d;hb=217e4d9dbb18e7c8dfd26f9fd74770614dd2024c;hp=ebd751b41de4ee71cc38d21b23699bbae6b8a4c2;hpb=bb102eef875adf3e667e4e3ffe7e6412b167b14e;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index ebd751b..d373579 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)
@@ -195,6 +203,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_DEV_MGR
 endif
 endif
 
+ifeq ($(DEBUG_NE2K),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NE2K
+else 
+ifeq ($(DEBUG_NE2K),0)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NE2K
+endif
+endif
+
 #DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
 
 ifeq ($(DEBUG),1)
@@ -233,6 +249,7 @@ else
   INSTRUMENT_OPT := 
 endif
 
+CFLAGS = -fno-stack-protector
 
 
 # ----------------------------------------------------------------------
@@ -263,10 +280,10 @@ 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 \
-	palacios/vm_dev.o \
 	palacios/vmm_dev_mgr.o \
 	palacios/vmm_decoder.o \
 	palacios/svm_halt.o \
@@ -276,6 +293,7 @@ VMM_OBJS := \
 	palacios/vmm_hashtable.o \
 	palacios/vmm_string.o \
 	palacios/vmm_emulator.o \
+	palacios/vmm_sprintf.o \
 	palacios/vmm_queue.o \
 	palacios/vmm_host_events.o \
 	palacios/svm_lowlevel.o \
@@ -288,13 +306,16 @@ VMM_OBJS := \
 	palacios/vmm_direct_paging.o \
 	palacios/vmm_ringbuffer.o \
 	palacios/vmm_hypercall.o \
+	palacios/vmm_lock.o \
+	palacios/vmx.o \
+	palacios/vmcs.o \
+	palacios/vmx_lowlevel.o \
 	$(OBJ_FILES)
 
-#		vmx.c vmcs_gen.c vmcs.c
 
 # Extra C flags for the VMM objects
 $(VMM_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -303,7 +324,7 @@ XED_OBJS := \
 	xed/v3-udiv-compat.o \
 
 $(XED_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -321,14 +342,23 @@ DEVICES_OBJS := \
 	devices/pci.o \
 	devices/para_net.o \
 	devices/ide.o \
-
-
+	devices/ram_cd.o \
+	devices/ram_hd.o \
+	devices/i440fx.o \
+	devices/piix3.o \
+	devices/net_cd.o \
+	devices/net_hd.o \
+	devices/lnx_virtio_blk.o \
+	devices/lnx_virtio_balloon.o \
+	devices/sym_swap.o \
+
+#	devices/ne2k.o	\
 #	devices/cdrom.o \
 #	devices/ramdisk.o \
 #   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -522,13 +552,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
@@ -566,6 +590,7 @@ clean :
 	for d in palacios devices xed; do \
 		(cd $$d && rm -f * .*.d); \
 	done
+	rm -f libv3vee.a
 
 
 # Include all of the generated dependency files if they exist