X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=3bde027cfe2db48fb3c8733beb457daeb47a14d5;hb=e3cd4f1c180c7a59177c7108c495a2e27af9db10;hp=2295912b188ea5332d98d3f3703047553c3dec7a;hpb=39b4fae9c539fbd848edd786500e60aae17b84a0;p=palacios-OLD.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 2295912..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));