X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=9d4c88f52438f477e2c4378da79f03dea90bde34;hb=f7bc654c609c9780d52f6fa980de987ddd337416;hp=4e8c8e31fca76ce34743e790875e769d63508cf7;hpb=a7dc3322984b3c76fe990de506418e180ec1b0de;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 4e8c8e3..9d4c88f 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -203,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)
@@ -241,6 +249,7 @@ else
   INSTRUMENT_OPT := 
 endif
 
+CFLAGS = -fno-stack-protector
 
 
 # ----------------------------------------------------------------------
@@ -275,7 +284,6 @@ VMM_OBJS := \
 	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 \
@@ -285,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 \
@@ -297,13 +306,20 @@ 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_handler.o \
+	palacios/vmx_lowlevel.o \
+	palacios/vmxassist.o \
+	palacios/vmx_io.o \
+	palacios/vmx_msr.o \
 	$(OBJ_FILES)
 
-#		vmx.c vmcs_gen.c vmcs.c
 
 # Extra C flags for the VMM objects
 $(VMM_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS) -DVMXASSIST_PATH="\"../build/vmxassist\"" \
 
 
 
@@ -312,7 +328,7 @@ XED_OBJS := \
 	xed/v3-udiv-compat.o \
 
 $(XED_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -334,13 +350,20 @@ DEVICES_OBJS := \
 	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/lnx_virtio_sym.o \
+	devices/sym_swap.o \
+
+#	devices/ne2k.o	\
 #	devices/cdrom.o \
 #	devices/ramdisk.o \
 #   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -533,8 +556,11 @@ rombios_link:
 vgabios_link:
 	ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
+vmxassist_link:
+	ln -s -f ../src/vmboot/vmxassist/vmxassist.bin vmxassist
+
 
-force_payload: rombios_link vgabios_link
+force_payload: rombios_link vgabios_link vmxassist_link
 	../scripts/make_payload.pl payload_layout.txt vm_kernel
 
 inter1: force_payload
@@ -572,6 +598,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