linux build fix and deinitialization fix

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index c5a7eb9..ea24ca3 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -72,17 +72,17 @@ 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:
+           PrintDebug("Deinitializing VMX CPU %d\n", cpu_id);
            v3_deinit_vmx_cpu(cpu_id);
            break;
 #endif
@@ -304,7 +304,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);