Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index c5a7eb9..ab26a6f 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -72,17 +72,18 @@ static void deinit_cpu(void * arg) {
 
 
     switch (v3_cpu_types[cpu_id]) {
- #ifdef CONFIG_SVM
-       case V3_VMX_CPU:
-       case V3_VMX_EPT_CPU:
-           PrintDebug("Machine is SVM Capable\n");
+#ifdef CONFIG_SVM
+       case V3_SVM_CPU:
+       case V3_SVM_REV3_CPU:
+           PrintDebug("Deinitializing SVM CPU %d\n", cpu_id);
            v3_deinit_svm_cpu(cpu_id);
            break;
 #endif
 #ifdef CONFIG_VMX
-       case V3_SVM_CPU:
-       case V3_SVM_REV3_CPU:
-           PrintDebug("Machine is VMX Capable\n");
+       case V3_VMX_CPU:
+       case V3_VMX_EPT_CPU:
+       case V3_VMX_EPT_UG_CPU:
+           PrintDebug("Deinitializing VMX CPU %d\n", cpu_id);
            v3_deinit_vmx_cpu(cpu_id);
            break;
 #endif
@@ -183,14 +184,13 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
 struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) {
     struct v3_vm_info * vm = v3_config_guest(cfg, priv_data);
 
-    V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
-
-
     if (vm == NULL) {
        PrintError("Could not configure guest\n");
        return NULL;
     }
 
+    V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
+
     if (name == NULL) {
        name = "[V3_VM]";
     } else if (strlen(name) >= 128) {
@@ -222,6 +222,7 @@ static int start_core(void * p)
 #if CONFIG_VMX
        case V3_VMX_CPU:
        case V3_VMX_EPT_CPU:
+       case V3_VMX_EPT_UG_CPU:
            return v3_start_vmx_guest(core);
            break;
 #endif
@@ -304,7 +305,6 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
        minor = core_idx % 8;
 
 
-
        if ((core_mask[major] & (0x1 << minor)) == 0) {
            PrintError("Logical CPU %d not available for virtual core %d; not started\n",
                       core_idx, vcore_id);
@@ -375,8 +375,6 @@ int v3_stop_vm(struct v3_vm_info * vm) {
            break;
        }
 
-       V3_Print("Yielding\n");
-
        v3_yield(NULL);
     }
     
@@ -518,6 +516,7 @@ int v3_vm_enter(struct guest_info * info) {
 #if CONFIG_VMX
        case V3_VMX_CPU:
        case V3_VMX_EPT_CPU:
+       case V3_VMX_EPT_UG_CPU:
            return v3_vmx_enter(info);
            break;
 #endif