X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=3bde027cfe2db48fb3c8733beb457daeb47a14d5;hb=559b7a07d8d5d783f0f2c2a64820ceaeda834a9e;hp=a1fad8d7b2947dfe2a580656ba9d9ed965513e70;hpb=53a87a14f98c8f77b252f19d08a7c701b04730ed;p=palacios.releases.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index a1fad8d..3bde027 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -64,7 +64,15 @@ extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs, vmcb_t * host_
 
 
 static vmcb_t * Allocate_VMCB() {
-    vmcb_t * vmcb_page = (vmcb_t *)V3_VAddr(V3_AllocPages(1));
+    vmcb_t * vmcb_page = NULL;
+    addr_t vmcb_pa = (addr_t)V3_AllocPages(1);
+
+    if ((void *)vmcb_pa == NULL) {
+	PrintError("Error allocating VMCB\n");
+	return NULL;
+    }
+
+    vmcb_page = (vmcb_t *)V3_VAddr((void *)vmcb_pa);
 
     memset(vmcb_page, 0, 4096);
 
@@ -271,17 +279,28 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) {
 
 	guest_state->g_pat = 0x7040600070406ULL;
     }
+    
+    /* tell the guest that we don't support SVM */
+    v3_hook_msr(core->vm_info, SVM_VM_CR_MSR, 
+	&v3_handle_vm_cr_read,
+	&v3_handle_vm_cr_write, 
+	core);
 }
 
 
-int v3_init_svm_vmcb(struct guest_info * info, v3_vm_class_t vm_class) {
+int v3_init_svm_vmcb(struct guest_info * core, v3_vm_class_t vm_class) {
 
     PrintDebug("Allocating VMCB\n");
-    info->vmm_data = (void*)Allocate_VMCB();
+    core->vmm_data = (void *)Allocate_VMCB();
     
+    if (core->vmm_data == NULL) {
+	PrintError("Could not allocate VMCB, Exiting...\n");
+	return -1;
+    }
+
     if (vm_class == V3_PC_VM) {
-	PrintDebug("Initializing VMCB (addr=%p)\n", (void *)info->vmm_data);
-	Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info);
+	PrintDebug("Initializing VMCB (addr=%p)\n", (void *)core->vmm_data);
+	Init_VMCB_BIOS((vmcb_t*)(core->vmm_data), core);
     } else {
 	PrintError("Invalid VM class\n");
 	return -1;
@@ -291,6 +310,11 @@ int v3_init_svm_vmcb(struct guest_info * info, v3_vm_class_t vm_class) {
 }
 
 
+int v3_deinit_svm_vmcb(struct guest_info * core) {
+    V3_FreePages(V3_PAddr(core->vmm_data), 1);
+    return 0;
+}
+
 
 static int update_irq_exit_state(struct guest_info * info) {
     vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
@@ -427,6 +451,8 @@ int v3_svm_enter(struct guest_info * info) {
     vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); 
     addr_t exit_code = 0, exit_info1 = 0, exit_info2 = 0;
 
+    v3_adjust_time(info);
+
     // Conditionally yield the CPU if the timeslice has expired
     v3_yield_cond(info);
 
@@ -478,11 +504,6 @@ int v3_svm_enter(struct guest_info * info) {
 #endif
 
     v3_update_timers(info);
-
-    /* If this guest is frequency-lagged behind host time, wait 
-     * for the appropriate host time before resuming the guest. */
-    v3_adjust_time(info);
-
     guest_ctrl->TSC_OFFSET = v3_tsc_host_offset(&info->time_state);
 
     //V3_Print("Calling v3_svm_launch\n");