commit b790f65a721cd63b3cf8f0dba7561c01a579ae40
author Wedson Almeida Filho <wedsonaf@google.com> Tue Jan 22 23:41:56 2019 +0000
committer Wedson Almeida Filho <wedsonaf@google.com> Wed Jan 23 12:48:16 2019 +0000
tree 987619a2c18c503c161dba183d524da4608b21b1
parent 1c87a7df8dcbfbf04136357a9468b0c4e9661446

Incorporate feedback on notification patches.

Change-Id: I15642cb739fae98de6fcd01b215821ace2b082ab

src/api.c

diff --git a/src/api.c b/src/api.c
index b17d101..1161230 100644
--- a/src/api.c
+++ b/src/api.c
@@ -540,7 +540,8 @@
 		 * setting up for notification if requested.
 		 */
 		if (notify) {
-			struct wait_entry *entry = &current->vm->wentry[vm_id];
+			struct wait_entry *entry =
+				&current->vm->wait_entries[vm_id];
 
 			/* Append waiter only if it's not there yet. */
 			if (list_empty(&entry->wait_links)) {
@@ -714,7 +715,7 @@
 	entry = CONTAINER_OF(vm->mailbox.ready_list.next, struct wait_entry,
 			     ready_links);
 	list_remove(&entry->ready_links);
-	ret = entry - vm->wentry;
+	ret = entry - vm->wait_entries;
 
 exit:
 	sl_unlock(&vm->lock);
@@ -725,8 +726,8 @@
  * Retrieves the next VM waiting to be notified that the mailbox of the
  * specified VM became writable. Only primary VMs are allowed to call this.
  *
- * Returns -1 if there are no waiters, or the VM id of the next waiter
- * otherwise.
+ * Returns -1 on failure or if there are no waiters; the VM id of the next
+ * waiter otherwise.
  */
 int64_t api_mailbox_waiter_get(uint32_t vm_id, const struct vcpu *current)
 {

src/vm.c

diff --git a/src/vm.c b/src/vm.c
index 9bc616f..38a9328 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -52,9 +52,9 @@
 
 	/* Initialise waiter entries. */
 	for (i = 0; i < MAX_VMS; i++) {
-		vm->wentry[i].waiting_vm = vm;
-		list_init(&vm->wentry[i].wait_links);
-		list_init(&vm->wentry[i].ready_links);
+		vm->wait_entries[i].waiting_vm = vm;
+		list_init(&vm->wait_entries[i].wait_links);
+		list_init(&vm->wait_entries[i].ready_links);
 	}
 
 	/* Do basic initialization of vcpus. */