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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 7ae2239..c010167 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -1,28 +1,55 @@
+/* 
+ * 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_decoder.h>
 
-uint_t vmm_cpu_type;
-
-
-
-
+v3_cpu_arch_t v3_cpu_type;
 struct vmm_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;
+}
+
 
-void Init_VMM(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) {
-  vmm_cpu_type = VMM_INVALID_CPU;
 
+void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) {
   os_hooks = hooks;
 
+  v3_cpu_type = V3_INVALID_CPU;
+
+  init_decoder();
 
   if (is_svm_capable()) {
-    vmm_cpu_type = VMM_SVM_CPU;
-    PrintDebug("Machine is SVM Capable\n");
 
+    PrintDebug("Machine is SVM Capable\n");
+    vmm_ops->allocate_guest = &allocate_guest;
+    vmm_ops->config_guest = &config_guest;
     Init_SVM(vmm_ops);
 
     /*
@@ -34,3 +61,7 @@ void Init_VMM(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) {
     PrintDebug("CPU has no virtualization Extensions\n");
   }
 }
+
+
+// Get CPU Type..
+