Have unregistered hypercalls fail to guest

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

diff --git a/palacios/src/palacios/vmm_hypercall.c b/palacios/src/palacios/vmm_hypercall.c
index 7dda3a4..21e6e96 100644 (file)
--- a/palacios/src/palacios/vmm_hypercall.c
+++ b/palacios/src/palacios/vmm_hypercall.c
@@ -32,14 +32,6 @@ static int hcall_test(struct guest_info * info, hcall_id_t hcall_id, void * priv
 }
 
 
-
-void v3_init_hypercall_map(struct v3_vm_info * vm) {
-    vm->hcall_map.rb_node = NULL;
-
-    v3_register_hypercall(vm, TEST_HCALL, hcall_test, NULL);
-}
-
-
 struct hypercall {
     uint_t id;
   
@@ -49,6 +41,36 @@ struct hypercall {
     struct rb_node tree_node;
 };
 
+static int free_hypercall(struct v3_vm_info * vm, struct hypercall * hcall);
+
+void v3_init_hypercall_map(struct v3_vm_info * vm) {
+    vm->hcall_map.rb_node = NULL;
+
+    v3_register_hypercall(vm, TEST_HCALL, hcall_test, NULL);
+}
+
+int v3_deinit_hypercall_map(struct v3_vm_info * vm) {
+    struct rb_node * node = NULL;
+    struct hypercall * hcall = NULL;
+    struct rb_node * tmp_node = NULL;
+
+    v3_remove_hypercall(vm, TEST_HCALL);
+
+    node = v3_rb_first(&(vm->hcall_map));
+
+    while (node) {
+       hcall = rb_entry(node, struct hypercall, tree_node);
+       tmp_node = node;
+       node = v3_rb_next(node);
+
+       free_hypercall(vm, hcall);
+    }
+    
+    return 0;
+}
+
+
+
 
 
 static inline struct hypercall * __insert_hypercall(struct v3_vm_info * vm, struct hypercall * hcall) {
@@ -114,6 +136,11 @@ int v3_register_hypercall(struct v3_vm_info * vm, hcall_id_t hypercall_id,
 
     struct hypercall * hcall = (struct hypercall *)V3_Malloc(sizeof(struct hypercall));
 
+    if (!hcall) {
+        PrintError(vm, VCORE_NONE, "Cannot allocate in registering hypercall\n");
+       return -1;
+    }
+
     hcall->id = hypercall_id;
     hcall->priv_data = priv_data;
     hcall->hcall_fn = hypercall;
@@ -127,20 +154,42 @@ int v3_register_hypercall(struct v3_vm_info * vm, hcall_id_t hypercall_id,
 }
 
 
+
+static int free_hypercall(struct v3_vm_info * vm, struct hypercall * hcall) {
+    v3_rb_erase(&(hcall->tree_node), &(vm->hcall_map));
+    V3_Free(hcall);
+
+    return 0;
+}
+
+int v3_remove_hypercall(struct v3_vm_info * vm, hcall_id_t hypercall_id) {
+    struct hypercall * hcall = get_hypercall(vm, hypercall_id);
+
+    if (hcall == NULL) {
+       PrintError(vm, VCORE_NONE, "Attempted to remove non existant hypercall\n");
+       return -1;
+    }
+
+    free_hypercall(vm, hcall);
+
+    return 0;
+}
+
+
 int v3_handle_hypercall(struct guest_info * info) {
     hcall_id_t hypercall_id = *(uint_t *)&info->vm_regs.rax;
     struct hypercall * hcall = get_hypercall(info->vm_info, hypercall_id);
 
     if (!hcall) {
-       PrintError("Invalid Hypercall (%d(0x%x) not registered)\n", 
+        PrintError(info->vm_info, info,  "Invalid Hypercall (%d(0x%x) not registered) => ignored with rax=-1\n", 
                   hypercall_id, hypercall_id);
-       return -1;
+       info->vm_regs.rax=-1;
+       return 0;
     }
 
-    if (hcall->hcall_fn(info, hypercall_id, hcall->priv_data) == 0) {
-       info->vm_regs.rax = 0;
-    } else {
-       info->vm_regs.rax = -1;
+    if (hcall->hcall_fn(info, hypercall_id, hcall->priv_data) != 0) {
+       PrintError(info->vm_info, info, "Error handling hypercall\n");
+       return -1;
     }
 
     return 0;