X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=7343cd5a057c79f009bb084775a10cd972fc3ad2;hb=ec6d459b0aac3e9eea431e854904be7a58f2ffa8;hp=d6dfb91994f985b19a13d169e1fe213f2e465006;hpb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index d6dfb91..7343cd5 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -23,7 +23,8 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
-#include <palacios/vmm_decoder.h>
+#include <palacios/vmm_instrument.h>
+
 
 v3_cpu_arch_t v3_cpu_type;
 struct v3_os_hooks * os_hooks = NULL;
@@ -31,35 +32,37 @@ struct v3_os_hooks * os_hooks = NULL;
 
 
 static struct guest_info * allocate_guest() {
-  void * info = V3_Malloc(sizeof(struct guest_info));
-  memset(info, 0, sizeof(struct guest_info));
-  return info;
+    void * info = V3_Malloc(sizeof(struct guest_info));
+    memset(info, 0, sizeof(struct guest_info));
+    return info;
 }
 
 
 
 void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
-  os_hooks = hooks;
+    os_hooks = hooks;
 
-  v3_cpu_type = V3_INVALID_CPU;
+    v3_cpu_type = V3_INVALID_CPU;
 
-  init_decoder();
+#ifdef INSTRUMENT_VMM
+    v3_init_instrumentation();
+#endif
 
-  if (v3_is_svm_capable()) {
+    if (v3_is_svm_capable()) {
 
-    PrintDebug("Machine is SVM Capable\n");
-    vmm_ops->allocate_guest = &allocate_guest;
-    vmm_ops->config_guest = &v3_config_guest;
-    v3_init_SVM(vmm_ops);
+	PrintDebug("Machine is SVM Capable\n");
+	vmm_ops->allocate_guest = &allocate_guest;
+	vmm_ops->config_guest = &v3_config_guest;
+	v3_init_SVM(vmm_ops);
 
-    /*
-  } else if (is_vmx_capable()) {
-    vmm_cpu_type = VMM_VMX_CPU;
-    PrintDebug("Machine is VMX Capable\n");
-    //Init_VMX();*/
-  } else {
-    PrintDebug("CPU has no virtualization Extensions\n");
-  }
+	/*
+	  } else if (is_vmx_capable()) {
+	  vmm_cpu_type = VMM_VMX_CPU;
+	  PrintDebug("Machine is VMX Capable\n");
+	  //Init_VMX();*/
+    } else {
+	PrintDebug("CPU has no virtualization Extensions\n");
+    }
 }