Lots of pedantic error checking in Palacios proper, especially for memory

[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 b614896..6899640 100644 (file)
--- a/palacios/src/palacios/vmm_hypercall.c
+++ b/palacios/src/palacios/vmm_hypercall.c
@@ -136,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("Cannot allocate in registering hypercall\n");
+       return -1;
+    }
+
     hcall->id = hypercall_id;
     hcall->priv_data = priv_data;
     hcall->hcall_fn = hypercall;
@@ -181,10 +186,9 @@ int v3_handle_hypercall(struct guest_info * info) {
        return -1;
     }
 
-    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("Error handling hypercall\n");
+       return -1;
     }
 
     return 0;