More init checks to allow graceful fail out when VM cannot be created

[palacios.git] / palacios / src / palacios / vmm_mem_hook.c

diff --git a/palacios/src/palacios/vmm_mem_hook.c b/palacios/src/palacios/vmm_mem_hook.c
index f4040ff..e4e1d98 100644 (file)
--- a/palacios/src/palacios/vmm_mem_hook.c
+++ b/palacios/src/palacios/vmm_mem_hook.c
@@ -81,6 +81,8 @@ int v3_init_mem_hooks(struct v3_vm_info * vm) {
 
     hooks->reg_table = v3_create_htable(0, mem_hash_fn, mem_eq_fn);
 
+    hooks->inited=1;
+
     return 0;
 }
 
@@ -93,6 +95,10 @@ int v3_deinit_mem_hooks(struct v3_vm_info * vm) {
     struct mem_hook * tmp = NULL;
 
 
+    if (!hooks->inited) { 
+       return 0;
+    }
+
     // This is nasty...
     // We delete the hook info but leave its memory region intact
     // We rely on the memory map to clean up any orphaned regions as a result of this
@@ -359,6 +365,12 @@ int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
 
     entry = v3_create_mem_region(vm, core_id, guest_addr_start, guest_addr_end);
 
+    if (!entry) { 
+       PrintError(vm, VCORE_NONE, "Cannot allocate a memory region\n");
+       V3_Free(hook);
+       return -1;
+    }
+
     hook->region = entry;
 
     entry->host_addr = host_addr;
@@ -370,6 +382,7 @@ int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
     entry->flags.alloced = 1;
 
     if (v3_insert_mem_region(vm, entry) == -1) {
+        PrintError(vm, VCORE_NONE, "Cannot insert memory region\n");
        V3_Free(entry);
        V3_Free(hook);
        return -1;
@@ -498,6 +511,7 @@ static int free_hook(struct v3_vm_info * vm, struct mem_hook * hook) {
 // We do not support unhooking subregions
 int v3_unhook_mem(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr_start) {
     struct v3_mem_region * reg = v3_get_mem_region(vm, core_id, guest_addr_start);
+    struct v3_mem_hooks * hooks = &(vm->mem_hooks);
     struct mem_hook * hook = NULL;
 
     if (reg == NULL) {
@@ -515,6 +529,8 @@ int v3_unhook_mem(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr_st
     
     free_hook(vm, hook);
 
+    v3_htable_remove(hooks->reg_table, (addr_t)reg, 0);
+
     return 0;
 }