Added shadow page handling, IO and MSR bitmap allocation, and started

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index f243949..a80ec28 100644 (file)
--- 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 \
@@ -331,13 +347,22 @@ DEVICES_OBJS := \
        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)\
 
 
 
@@ -530,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
@@ -569,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