X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=a80ec28f5e5a1e5ec9ab5faf55c4654cf87bfcaf;hb=52a58bb7bdf06ca22ad6883f8095f8aa5ca4b8a4;hp=b1a0b4e1db040ea3b1055d5ff83a1f637cc1628f;hpb=78818a71a31b4cbe264c1292f7bcbdbfd2ceb544;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index b1a0b4e..a80ec28 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -249,6 +249,7 @@ else
   INSTRUMENT_OPT := 
 endif
 
+CFLAGS = -fno-stack-protector
 
 
 # ----------------------------------------------------------------------
@@ -283,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 \
@@ -293,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 \
@@ -305,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\"" \
 
 
 
@@ -320,7 +328,7 @@ XED_OBJS := \
 	xed/v3-udiv-compat.o \
 
 $(XED_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -342,6 +350,11 @@ 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/sym_swap.o \
 
 #	devices/ne2k.o	\
 #	devices/cdrom.o \
@@ -349,7 +362,7 @@ DEVICES_OBJS := \
 #   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -542,8 +555,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
@@ -581,6 +597,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