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

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 4d148e9..facdb18 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -36,6 +36,7 @@
 
 #include <palacios/vmm_rbtree.h>
 #include <palacios/vmm_barrier.h>
+#include <palacios/vmm_debug.h>
 
 #ifdef V3_CONFIG_CHECKPOINT
 #include <palacios/vmm_checkpoint.h>
@@ -368,15 +369,25 @@ int v3_deinit_svm_vmcb(struct guest_info * core) {
 #ifdef V3_CONFIG_CHECKPOINT
 int v3_svm_save_core(struct guest_info * core, void * ctx){
 
-    v3_chkpt_save_8(ctx, "cpl", &(core->cpl));
-    v3_chkpt_save(ctx, "vmcb_data", PAGE_SIZE, core->vmm_data);
+    if (v3_chkpt_save_8(ctx, "cpl", &(core->cpl)) == -1) { 
+       PrintError("Could not save SVM cpl\n");
+       return -1;
+    }
+
+    if (v3_chkpt_save(ctx, "vmcb_data", PAGE_SIZE, core->vmm_data) == -1) { 
+       PrintError("Could not save SVM vmcb\n");
+       return -1;
+    }
 
     return 0;
 }
 
 int v3_svm_load_core(struct guest_info * core, void * ctx){
     
-    v3_chkpt_load_8(ctx, "cpl", &(core->cpl));
+    if (v3_chkpt_load_8(ctx, "cpl", &(core->cpl)) == -1) { 
+       PrintError("Could not load SVM cpl\n");
+       return -1;
+    }
 
     if (v3_chkpt_load(ctx, "vmcb_data", PAGE_SIZE, core->vmm_data) == -1) {
        return -1;
@@ -927,6 +938,11 @@ void v3_init_svm_cpu(int cpu_id) {
     // Setup the host state save area
     host_vmcbs[cpu_id] = (addr_t)V3_AllocPages(4);
 
+    if (!host_vmcbs[cpu_id]) {
+       PrintError("Failed to allocate VMCB\n");
+       return;
+    }
+
     /* 64-BIT-ISSUE */
     //  msr.e_reg.high = 0;
     //msr.e_reg.low = (uint_t)host_vmcb;
@@ -1166,6 +1182,11 @@ void Init_VMCB_pe(vmcb_t *vmcb, struct guest_info vm_info) {
 
   ctrl_area->instrs.IOIO_PROT = 1;
   ctrl_area->IOPM_BASE_PA = (uint_t)V3_AllocPages(3);
+
+  if (!ctrl_area->IOPM_BASE_PA) { 
+      PrintError("Cannot allocate IO bitmap\n");
+      return;
+  }
   
   {
     reg_ex_t tmp_reg;