fixed configuration macro checks and a few configuration bugs

[palacios.git] / palacios / include / palacios / vmm_instrument.h

diff --git a/palacios/include/palacios/vmm_instrument.h b/palacios/include/palacios/vmm_instrument.h
index f9e1176..63b2be2 100644 (file)
--- a/palacios/include/palacios/vmm_instrument.h
+++ b/palacios/include/palacios/vmm_instrument.h
@@ -22,27 +22,13 @@
 
 #ifdef __V3VEE__
 
-#ifdef INSTRUMENT_VMM 
+#ifdef CONFIG_INSTRUMENT_VMM 
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_ringbuffer.h>
 
-ullong_t now, last;
-
-int instrument_start;
-
-struct Inst_RingBuff *ring_buff;
-
-struct PackData *pack_data;
-
-void __attribute__((__no_instrument_function__)) v3_init_cyg_profiler ();
- 
-void __attribute__((__no_instrument_function__))
-__cyg_profile_func_enter( void *this, void *callsite );
- 
-void __attribute__((__no_instrument_function__)) 
-__cyg_profile_func_exit( void *this, void *callsite );
 
+void v3_init_instrumentation() __attribute__((__no_instrument_function__));
 
 #endif // INSTRUMENT_VMM