Makefile now has global debug control:

make DEBUG=1 <whatever> turns on all the debug defines, etc

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 5df84e8..eb45f7f 100644 (file)
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.41 $
+# $Revision: 1.42 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -41,7 +41,14 @@ VPATH := $(PROJECT_ROOT)/src
 
 #when -DNDEBUG is set the kassert functions are disabled
 #JRLDEBUG=-DNDEBUG
-JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1
+
+DEBUG=1
+
+ifeq ($(DEBUG),1)
+  JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 -DVMM_DEBUG=1 -DVMM_INFO=1 -DVMM_TRACE=1
+else
+  JRLDEBUG= -DSERIAL_PRINT_DEBUG=0 -DSERIAL_PRINT_DEBUG_LEVEL=999999 -DSERIAL_PRINT=0 -DVMM_DEBUG=0 -DVMM_INFO=0 -DVMM_TRACE=0
+endif
 
 #
 #
@@ -302,20 +309,26 @@ vmm.img : fd.img
 
 force_rombios: 
        (cd ../src/vmboot/rombios; make clean; make)
-#      cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
 
 force_vgabios:
        (cd ../src/vmboot/vgabios; make clean; make)
 
-world: force_rombios force_vgabios
+force_payload: force_rombios force_vgabios
        ../scripts/make_payload.pl payload_layout.txt vm_kernel
-       - make clean
-       make vmm.img
+
+inter1: force_payload
+       -make clean
+
+world: inter1 vmm.img
 
 # make ready to boot over PXE
 pxe:   vmm.img
        cp vmm.img /tftpboot/vmm.img
 
+run: vmm.img
+       /usr/local/qemu/bin/qemu-system-x86_64 -m 1024 -serial file:serial.out -cdrom puppy.iso -fda vmm.img 
+
+
 
 
 # Floppy boot sector (first stage boot loader).

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index a892094..10d001e 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -14,33 +14,44 @@
 //#include <palacios/vmm_paging.h>
 
 /* utility definitions */
+
+#if VMM_DEBUG
 #define PrintDebug(fmt, args...)                       \
   do {                                                 \
     extern struct vmm_os_hooks * os_hooks;             \
     if ((os_hooks) && (os_hooks)->print_debug) {       \
       (os_hooks)->print_debug((fmt), ##args);          \
     }                                                  \
-  } while (0)                                          \
-
+  } while (0)                                          
+#else
+#define PrintDebug(fmt,args ...)
+#endif
 
 
+#if VMM_INFO
 #define PrintInfo(fmt, args...)                        \
   do {                                                 \
     extern struct vmm_os_hooks * os_hooks;             \
     if ((os_hooks) && (os_hooks)->print_info) {                \
       (os_hooks)->print_info((fmt), ##args);           \
     }                                                  \
-  } while (0)                                          \
+  } while (0)                                          
+#else
+#define PrintInfo(fmt, args...)
+#endif
 
 
+#if VMM_TRACE
 #define PrintTrace(fmt, args...)                       \
   do {                                                 \
     extern struct vmm_os_hooks * os_hooks;             \
     if ((os_hooks) && (os_hooks)->print_trace) {       \
       (os_hooks)->print_trace((fmt), ##args);          \
     }                                                  \
-  } while (0)                                          \
-
+  } while (0)                                          
+#else
+#define PrintTrace(fmt, args...)
+#endif
 
 
 #define V3_AllocPages(ptr, num_pages)                  \