X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=5525d65b4a1b031c3ce7af6b82d0dac4ecd9841d;hb=c163873b7b96544683030cafba0e73a7ed988171;hp=6eb6de393f07e9d63acb4ee104a42d3643d7cb3f;hpb=101529b6eae500272347287df43ec51aa003d0aa;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 6eb6de3..5525d65 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -1,5 +1,21 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <palacios/vmm.h>
 #include <palacios/svm.h>
@@ -7,45 +23,48 @@
 #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;
+	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");
+    }
 }
-
-
-// Get CPU Type..
-