added virtio balloon device, currently discards free pages...

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 1e55a2d..d373579 100644 (file)
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -62,7 +62,8 @@ 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 -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK
+  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
 
 
@@ -72,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)
@@ -146,19 +155,11 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_EMULATOR
 endif
 endif
 
-ifeq ($(DEBUG_RAMDISK),1)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK
+ifeq ($(DEBUG_IDE),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IDE
 else 
-ifeq ($(DEBUG_RAMDISK),0) 
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK
-endif
-endif
-
-ifeq ($(TRACE_RAMDISK),1)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTRACE_RAMDISK
-else
-ifeq ($(TRACE_RAMDSK),0)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UTRACE_RAMDISK
+ifeq ($(DEBUG_IDE),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IDE
 endif
 endif
 
@@ -202,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)
@@ -240,6 +249,7 @@ else
   INSTRUMENT_OPT := 
 endif
 
+CFLAGS = -fno-stack-protector
 
 
 # ----------------------------------------------------------------------
@@ -274,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 \
@@ -284,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 \
@@ -296,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)\
 
 
 
@@ -311,7 +324,7 @@ XED_OBJS := \
        xed/v3-udiv-compat.o \
 
 $(XED_OBJS) :: EXTRA_CFLAGS = \
-       $(JRLDEBUG) \
+       $(JRLDEBUG) $(CFLAGS)\
 
 DEVICES_OBJS := \
        devices/generic.o \
@@ -322,19 +335,30 @@ DEVICES_OBJS := \
        devices/8259a.o \
        devices/8254.o \
        devices/serial.o \
-       devices/ramdisk.o \
-       devices/cdrom.o \
        devices/bochs_debug.o \
        devices/os_debug.o \
        devices/apic.o  \
        devices/io_apic.o \
        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)\
 
 
 
@@ -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