X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=c07476fd29c8053262801a561e7b960c01b082d2;hb=785b7105d35b97c6e7a176facc29a2efdb234951;hp=c0101670fac22476b5afd50f7e032b985e6183ed;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index c010167..c07476f 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -23,45 +23,47 @@
 #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>
 
+
+/* These should be the only global variables in Palacios */
+/* They are architecture specific variables */
 v3_cpu_arch_t v3_cpu_type;
-struct vmm_os_hooks * os_hooks = NULL;
+struct v3_os_hooks * os_hooks = NULL;
 
 
 
-struct guest_info * allocate_guest() {
-  void * info = V3_Malloc(sizeof(struct guest_info));
-  memset(info, 0, sizeof(struct guest_info));
-  return info;
+static struct guest_info * allocate_guest() {
+    void * info = V3_Malloc(sizeof(struct guest_info));
+    memset(info, 0, sizeof(struct guest_info));
+    return info;
 }
 
 
 
-void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) {
-  os_hooks = hooks;
+void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
+    
+    // Set global variables. 
+    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 (is_svm_capable()) {
+    if (v3_is_svm_capable()) {
 
-    PrintDebug("Machine is SVM Capable\n");
-    vmm_ops->allocate_guest = &allocate_guest;
-    vmm_ops->config_guest = &config_guest;
-    Init_SVM(vmm_ops);
+	PrintDebug("Machine is SVM Capable\n");
+	vmm_ops->allocate_guest = &allocate_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");
+    }
 }
-
-
-// Get CPU Type..
-