X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=77c654ed17d4e1b1c2e79404de5b018485a4ead9;hb=0e1c2f1eb7e964848d43824328205d5557bc7639;hp=8b04b5118e196aa96ab6aa7bb1d7e83c7cfe63f5;hpb=23ee10c7be0d5c16226b2f703741842248add8e7;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 8b04b51..77c654e 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -1,16 +1,37 @@
+/* 
+ * 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>
 #include <palacios/vmx.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_instrument.h>
+
 
 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() {
+static struct guest_info * allocate_guest() {
   void * info = V3_Malloc(sizeof(struct guest_info));
   memset(info, 0, sizeof(struct guest_info));
   return info;
@@ -18,17 +39,21 @@ struct guest_info * allocate_guest() {
 
 
 
-void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) {
+void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
   os_hooks = hooks;
 
   v3_cpu_type = V3_INVALID_CPU;
 
-  if (is_svm_capable()) {
+#ifdef INSTRUMENT_VMM
+  v3_init_instrumentation();
+#endif
+
+  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);
+    vmm_ops->config_guest = &v3_config_guest;
+    v3_init_SVM(vmm_ops);
 
     /*
   } else if (is_vmx_capable()) {