Fixed major palacios barrier implementation error with potentially serious implicatio...

diff --git a/palacios/src/palacios/vmm_barrier.c b/palacios/src/palacios/vmm_barrier.c
index 5dc1ce8..35efe0f 100644 (file)
--- a/palacios/src/palacios/vmm_barrier.c
+++ b/palacios/src/palacios/vmm_barrier.c
@@ -142,7 +142,7 @@ int v3_raise_barrier(struct v3_vm_info * vm_info, struct guest_info * local_core
     int ret = 0;
 
 
-    if ((vm_info->run_state != VM_RUNNING) || 
+    if ((vm_info->run_state != VM_RUNNING) && 
        (vm_info->run_state != VM_SIMULATING)) {
        return 0;
     }
@@ -169,7 +169,7 @@ int v3_lower_barrier(struct v3_vm_info * vm_info) {
     struct v3_barrier * barrier = &(vm_info->barrier);
 
     
-    if ((vm_info->run_state != VM_RUNNING) || 
+    if ((vm_info->run_state != VM_RUNNING) && 
        (vm_info->run_state != VM_SIMULATING)) {
        return 0;
     }