removed segment regs from guest_info struct

[palacios.git] / palacios / src / palacios / vmm.c

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 8459e4c..7343cd5 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -32,37 +32,37 @@ struct v3_os_hooks * os_hooks = NULL;
 
 
 static struct guest_info * allocate_guest() {
-  void * info = V3_Malloc(sizeof(struct guest_info));
-  memset(info, 0, sizeof(struct guest_info));
-  return info;
+    void * info = V3_Malloc(sizeof(struct guest_info));
+    memset(info, 0, sizeof(struct guest_info));
+    return info;
 }
 
 
 
 void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
-  os_hooks = hooks;
+    os_hooks = hooks;
 
-  v3_cpu_type = V3_INVALID_CPU;
+    v3_cpu_type = V3_INVALID_CPU;
 
-       #ifdef INSTRUMENT_VMM
-           v3_init_cyg_profiler();
-       #endif
+#ifdef INSTRUMENT_VMM
+    v3_init_instrumentation();
+#endif
 
-  if (v3_is_svm_capable()) {
+    if (v3_is_svm_capable()) {
 
-    PrintDebug("Machine is SVM Capable\n");
-    vmm_ops->allocate_guest = &allocate_guest;
-    vmm_ops->config_guest = &v3_config_guest;
-    v3_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");
+    }
 }