Basic HRT startup for HVM, plus assorted cleanup

[palacios.git] / palacios / src / devices / simple_pic.c

diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c
index 96907df..16039e4 100644 (file)
--- a/palacios/src/devices/simple_pic.c
+++ b/palacios/src/devices/simple_pic.c
@@ -82,12 +82,17 @@ static struct v3_device_ops dev_ops = {
 static int pic_init(struct guest_info * vm, void * cfg_data) {
     struct pic_internal * state = NULL;
     state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
-    V3_ASSERT(state != NULL);
+
+    if (!state) {
+       PrintError(info->vm_info, info, "Cannot allocate in init\n");
+       return -1;
+    }
 
     struct vm_device * dev = v3_allocate_device("SIMPLE_PIC", &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-        PrintError("Could not attach device %s\n", "SIMPLE_PIC");
+        PrintError(info->vm_info, info, "Could not attach device %s\n", "SIMPLE_PIC");
+       V3_Free(state);
         return -1;
     }