Rename vm_from_to_lock to reflect actual order of VMs.
Change-Id: Ie2832c6f3c271f4400264bca5fee77bf29087f17
diff --git a/src/api.c b/src/api.c
index 7c1f12a..9ee5c5c 100644
--- a/src/api.c
+++ b/src/api.c
@@ -855,7 +855,7 @@
struct vm *from = current->vm;
struct vm *to;
- struct two_vm_locked vm_from_to_lock;
+ struct two_vm_locked vm_to_from_lock;
struct hf_vcpu_run_return primary_ret = {
.code = HF_VCPU_RUN_MESSAGE,
@@ -909,7 +909,7 @@
* which must hold the <from> lock, we must hold the <from> lock at this
* point to prevent a deadlock scenario.
*/
- vm_from_to_lock = vm_lock_both(to, from);
+ vm_to_from_lock = vm_lock_both(to, from);
if (to->mailbox.state != MAILBOX_STATE_EMPTY ||
to->mailbox.recv == NULL) {
@@ -973,7 +973,7 @@
* Hafnium so that TOCTOU issues do not arise.
*/
ret = spci_msg_handle_architected_message(
- vm_from_to_lock.vm1, vm_from_to_lock.vm2,
+ vm_to_from_lock.vm1, vm_to_from_lock.vm2,
architected_message_replica, size);
if (ret.func != SPCI_SUCCESS_32) {
@@ -1014,8 +1014,8 @@
}
out:
- vm_unlock(&vm_from_to_lock.vm1);
- vm_unlock(&vm_from_to_lock.vm2);
+ vm_unlock(&vm_to_from_lock.vm1);
+ vm_unlock(&vm_to_from_lock.vm2);
return ret;
}
