X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=96bd523f3615ecdaf12ecfbb9829d70ca4086fc2;hb=c583c305d980b827d97a1e7eaa374ecd890e4fda;hp=457f0783f099bd3981391f874b68ad779e02ac98;hpb=496b928649b2a63c3e21e099ce914ec00b3d7227;p=palacios.releases.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 457f078..96bd523 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -179,6 +179,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_HALT
 endif
 endif
 
+ifeq ($(DEBUG_APIC),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_APIC
+else 
+ifeq ($(DEBUG_APIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_APIC
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -217,6 +225,15 @@ endif
 
 
 
+ifeq ($(INSTRUMENT_VMM),1)
+  EXTRA_C_OPTS:= -DINSTRUMENT_VMM
+  INSTRUMENT_OPT := -finstrument-functions
+  OBJ_FILES := palacios/vmm_instrument.o
+else
+  INSTRUMENT_OPT := 
+endif
+
+
 
 # ----------------------------------------------------------------------
 # Configuration -
@@ -269,6 +286,9 @@ VMM_OBJS := \
 	palacios/vmm_rbtree.o \
 	palacios/vmm_profiler.o \
 	palacios/vmm_direct_paging.o \
+	palacios/vmm_ringbuffer.o \
+	palacios/vmm_hypercall.o \
+	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -299,6 +319,7 @@ DEVICES_OBJS := \
 	devices/bochs_debug.o \
 	devices/os_debug.o \
 	devices/apic.o	\
+	devices/io_apic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
@@ -403,7 +424,6 @@ CC_GENERAL_OPTS = \
 #-fvisibility=hidden
 
 
-
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
 OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
 
@@ -439,6 +459,7 @@ CC_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)
 
 AS_COMPILE = \
@@ -448,6 +469,7 @@ AS_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)