Incorporating feedback.
Change-Id: Iaefa5d51f5872efa29e8c32e3d6bfdaae6b8966b
diff --git a/src/api.c b/src/api.c
index 96474a8..7cbe1b1 100644
--- a/src/api.c
+++ b/src/api.c
@@ -38,7 +38,7 @@
"Currently, a page is mapped for the send and receive buffers so "
"the maximum request is the size of a page.");
-static struct mpool api_ppool;
+static struct mpool api_page_pool;
/**
* Initialies the API page pool by taking ownership of the contents of the given
@@ -46,7 +46,7 @@
*/
void api_init(struct mpool *ppool)
{
- mpool_init_from(&api_ppool, ppool);
+ mpool_init_from(&api_page_pool, ppool);
}
/**
@@ -234,7 +234,7 @@
/* Map the send page as read-only in the hypervisor address space. */
vm->mailbox.send = mm_identity_map(pa_send_begin, pa_send_end,
- MM_MODE_R, &api_ppool);
+ MM_MODE_R, &api_page_pool);
if (!vm->mailbox.send) {
ret = -1;
goto exit;
@@ -245,10 +245,10 @@
* failure, unmap the send page before returning.
*/
vm->mailbox.recv = mm_identity_map(pa_recv_begin, pa_recv_end,
- MM_MODE_W, &api_ppool);
+ MM_MODE_W, &api_page_pool);
if (!vm->mailbox.recv) {
vm->mailbox.send = NULL;
- mm_unmap(pa_send_begin, pa_send_end, 0, &api_ppool);
+ mm_unmap(pa_send_begin, pa_send_end, 0, &api_page_pool);
ret = -1;
goto exit;
}
diff --git a/src/main.c b/src/main.c
index a5c1f29..1ea4ed9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,7 @@
#include "vmapi/hf/call.h"
-alignas(sizeof(
+alignas(alignof(
struct mm_page_table)) char ptable_buf[sizeof(struct mm_page_table) *
HEAP_PAGES];
