Add Virtual PCI and Virtual NIC

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8fbe2a2..0d114cd 100644 (file)
--- 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 
@@ -219,8 +227,14 @@ 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 -
 #   Various options specifying how GeekOS should be built,
@@ -273,7 +287,8 @@ VMM_OBJS := \
        palacios/vmm_profiler.o \
        palacios/vmm_direct_paging.o \
        palacios/vmm_ringbuffer.o \
-       palacios/vmm_instrument.o \
+       palacios/vmm_hypercall.o \
+       $(OBJ_FILES)
 
 #              vmx.c vmcs_gen.c vmcs.c
 
@@ -304,6 +319,9 @@ DEVICES_OBJS := \
        devices/bochs_debug.o \
        devices/os_debug.o \
        devices/apic.o  \
+       devices/io_apic.o \
+       devices/vnic.o \
+       devices/vpci.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
        $(JRLDEBUG) \
@@ -407,11 +425,6 @@ CC_GENERAL_OPTS = \
 #-fPIC \
 #-fvisibility=hidden
 
-ifeq ($(INSTRUMENT_VMM),1)
-       INSTRUMENT_OPT = -finstrument-functions
-else
-       INSTRUMENT_OPT = 
-endif
 
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
 OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment