Cleanup based on cppcheck pass (Core)

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

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 7665fd3..544b848 100644 (file)
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -44,6 +44,10 @@
 #include <palacios/vmx_assist.h>
 #include <palacios/vmx_hw_info.h>
 
+#ifdef V3_CONFIG_MEM_TRACK
+#include <palacios/vmm_mem_track.h>
+#endif 
+
 #ifndef V3_CONFIG_DEBUG_VMX
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
@@ -542,7 +546,10 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
     vmx_ret |= check_vmcs_write(VMCS_LINK_PTR_HIGH, (addr_t)0xffffffffUL);
 #endif
 
-
+    if (vmx_ret != VMX_SUCCESS) { 
+       PrintError(core->vm_info, core, "Error configuring VMX\n");
+       return -1;
+    }
 
  
 
@@ -617,6 +624,11 @@ static void __init_vmx_vmcs(void * arg) {
     PrintDebug(core->vm_info, core, "Serializing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys);
     vmx_ret = vmcs_clear(vmx_state->vmcs_ptr_phys);
 
+    if (vmx_ret != VMX_SUCCESS) { 
+       PrintError(core->vm_info,core,"VMCS Clear failed\n");
+       return;
+    }
+
     core->core_run_state = CORE_STOPPED;
     return;
 }
@@ -978,6 +990,10 @@ int v3_vmx_enter(struct guest_info * info) {
     // Conditionally yield the CPU if the timeslice has expired
     v3_schedule(info);
 
+#ifdef V3_CONFIG_MEM_TRACK
+    v3_mem_track_entry(info);
+#endif 
+
     // Update timer devices late after being in the VM so that as much 
     // of the time in the VM is accounted for as possible. Also do it before
     // updating IRQ entry state so that any interrupts the timers raise get 
@@ -1178,6 +1194,10 @@ int v3_vmx_enter(struct guest_info * info) {
        v3_handle_timeouts(info, guest_cycles);
     }
 
+#ifdef V3_CONFIG_MEM_TRACK
+    v3_mem_track_exit(info);
+#endif 
+
     return 0;
 }
 
@@ -1186,6 +1206,20 @@ int v3_start_vmx_guest(struct guest_info * info) {
 
     PrintDebug(info->vm_info, info, "Starting VMX core %u\n", info->vcpu_id);
 
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_setup_multiboot_core_for_boot(info)) { 
+       PrintError(info->vm_info, info, "Failed to setup Multiboot core...\n");
+       return -1;
+    }
+#endif
+
+#ifdef V3_CONFIG_HVM
+    if (v3_setup_hvm_hrt_core_for_boot(info)) { 
+       PrintError(info->vm_info, info, "Failed to setup HRT core...\n");
+       return -1;
+    }
+#endif
+    
     while (1) {
        if (info->core_run_state == CORE_STOPPED) {
            if (info->vcpu_id == 0) {
@@ -1233,6 +1267,18 @@ int v3_start_vmx_guest(struct guest_info * info) {
        }
        
        
+#ifdef V3_CONFIG_HVM
+        if (v3_handle_hvm_reset(info) > 0) {
+           continue;
+        }
+#endif
+       
+#ifdef V3_CONFIG_MULTIBOOT
+        if (v3_handle_multiboot_reset(info) > 0) {
+           continue;
+        }
+#endif
+
 #ifdef V3_CONFIG_PMU_TELEMETRY
        v3_pmu_telemetry_start(info);
 #endif