X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=b7429b07ff41843e354d5ca3fc7e20b8be3d0cbd;hb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;hp=5a3eb044020943a3540d21cd6c684894daf5eebb;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 5a3eb04..b7429b0 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -1,28 +1,39 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #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 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 +45,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..
+