X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_cpuid.c;h=c1700898b3e75636e97e95bd41ac28f226479951;hb=02d617c8f625ad5da6c4c9b78b224e84baac5d08;hp=ca7ef86296f0037ae468fd31f8c8b5fe73a2cc9d;hpb=aaaaaaac22479d0f92f4249d06221e830e8c8f4d;p=palacios.git

diff --git a/palacios/src/palacios/vmm_cpuid.c b/palacios/src/palacios/vmm_cpuid.c
index ca7ef86..c170089 100644
--- a/palacios/src/palacios/vmm_cpuid.c
+++ b/palacios/src/palacios/vmm_cpuid.c
@@ -43,6 +43,30 @@ void v3_init_cpuid_map(struct v3_vm_info * vm) {
     // Disable XSAVE (cpuid 0x01, ECX bit 26)
     v3_cpuid_add_fields(vm, 0x01, 0, 0, 0, 0, (1 << 26), 0, 0, 0);
 
+    // Disable MONITOR/MWAIT (cpuid 0x01, ECX bit 3)
+    v3_cpuid_add_fields(vm, 0x01, 0, 0, 0, 0, (1 << 3), 0, 0, 0);
+
+
+    // disable MTRR
+    v3_cpuid_add_fields(vm, 0x00000001, 0, 0, 0, 0, 0, 0, (1 << 12), 0);
+    // disable PAT
+    v3_cpuid_add_fields(vm, 0x00000001, 0, 0, 0, 0, 0, 0, (1 << 16), 0);
+    // disable X2APIC
+    v3_cpuid_add_fields(vm, 0x00000001, 0, 0, 0, 0, (1 << 21), 0, 0, 0);
+
+
+    // Demarcate machine as a VM
+    v3_cpuid_add_fields(vm, 0x00000001,
+                        0, 0,
+                        0, 0,
+                        0x80000000, 0x80000000,
+                        0, 0
+                        );
+
+
+    // disable ARAT
+    v3_cpuid_add_fields(vm, 0x00000006, (1 << 2), 0, 0, 0, 0, 0, 0, 0);
+
 }
 
 
@@ -166,13 +190,19 @@ int v3_cpuid_add_fields(struct v3_vm_info * vm, uint32_t cpuid,
 
     if ((~rax_mask & rax) || (~rbx_mask & rbx) ||
 	(~rcx_mask & rcx) || (~rdx_mask & rdx)) {
-	PrintError("Invalid cpuid reg value (mask overrun)\n");
+	PrintError(vm, VCORE_NONE, "Invalid cpuid reg value (mask overrun)\n");
 	return -1;
     }
 
 
     if (hook == NULL) {
 	struct masked_cpuid * mask = V3_Malloc(sizeof(struct masked_cpuid));
+
+	if (!mask) {
+	    PrintError(vm, VCORE_NONE, "Unable to alocate space for cpu id mask\n");
+	    return -1;
+	}
+
 	memset(mask, 0, sizeof(struct masked_cpuid));
 	
 	mask->rax_mask = rax_mask;
@@ -185,7 +215,8 @@ int v3_cpuid_add_fields(struct v3_vm_info * vm, uint32_t cpuid,
 	mask->rdx = rdx;
 
 	if (v3_hook_cpuid(vm, cpuid, mask_hook, mask) == -1) {
-	    PrintError("Error hooking cpuid %d\n", cpuid);
+	    PrintError(vm, VCORE_NONE, "Error hooking cpuid %d\n", cpuid);
+	    V3_Free(mask);
 	    return -1;
 	}
     } else {
@@ -193,7 +224,7 @@ int v3_cpuid_add_fields(struct v3_vm_info * vm, uint32_t cpuid,
 	uint32_t tmp_val = 0;
 
 	if (hook->hook_fn != mask_hook) {
-	    PrintError("trying to add fields to a fully hooked cpuid (%d)\n", cpuid);
+	    PrintError(vm, VCORE_NONE, "trying to add fields to a fully hooked cpuid (%d)\n", cpuid);
 	    return -1;
 	}
 	
@@ -203,7 +234,7 @@ int v3_cpuid_add_fields(struct v3_vm_info * vm, uint32_t cpuid,
 	    (mask->rbx_mask & rbx_mask) || 
 	    (mask->rcx_mask & rcx_mask) || 
 	    (mask->rdx_mask & rdx_mask)) {
-	    PrintError("Trying to add fields that have already been masked\n");
+	    PrintError(vm, VCORE_NONE, "Trying to add fields that have already been masked\n");
 	    return -1;
 	}
 
@@ -237,7 +268,7 @@ int v3_unhook_cpuid(struct v3_vm_info * vm, uint32_t cpuid) {
     struct v3_cpuid_hook * hook = get_cpuid_hook(vm, cpuid);
 
     if (hook == NULL) {
-	PrintError("Could not find cpuid to unhook (0x%x)\n", cpuid);
+	PrintError(vm, VCORE_NONE, "Could not find cpuid to unhook (0x%x)\n", cpuid);
 	return -1;
     }
 
@@ -257,17 +288,23 @@ int v3_hook_cpuid(struct v3_vm_info * vm, uint32_t cpuid,
     struct v3_cpuid_hook * hook = NULL;
 
     if (hook_fn == NULL) {
-	PrintError("CPUID hook requested with null handler\n");
+	PrintError(vm, VCORE_NONE, "CPUID hook requested with null handler\n");
 	return -1;
     }
 
     hook = (struct v3_cpuid_hook *)V3_Malloc(sizeof(struct v3_cpuid_hook));
+
+    if (!hook) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate memory to hook cpu id\n");
+	return -1;
+    }
+
     hook->cpuid = cpuid;
     hook->private_data = private_data;
     hook->hook_fn = hook_fn;
 
     if (insert_cpuid_hook(vm, hook)) {
-	PrintError("Could not hook cpuid 0x%x (already hooked)\n", cpuid);
+	PrintError(vm, VCORE_NONE, "Could not hook cpuid 0x%x (already hooked)\n", cpuid);
 	V3_Free(hook);
 	return -1;
     }
@@ -279,10 +316,10 @@ int v3_handle_cpuid(struct guest_info * info) {
     uint32_t cpuid = info->vm_regs.rax;
     struct v3_cpuid_hook * hook = get_cpuid_hook(info->vm_info, cpuid);
 
-    //PrintDebug("CPUID called for 0x%x\n", cpuid);
+    //PrintDebug(info->vm_info, info, "CPUID called for 0x%x\n", cpuid);
 
     if (hook == NULL) {
-	//PrintDebug("Calling passthrough handler\n");
+	//PrintDebug(info->vm_info, info, "Calling passthrough handler\n");
 	// call the passthrough handler
 	v3_cpuid(cpuid, 
 		 (uint32_t *)&(info->vm_regs.rax), 
@@ -290,7 +327,7 @@ int v3_handle_cpuid(struct guest_info * info) {
 		 (uint32_t *)&(info->vm_regs.rcx), 
 		 (uint32_t *)&(info->vm_regs.rdx));
     } else {
-	//	PrintDebug("Calling hook function\n");
+	//	PrintDebug(info->vm_info, info, "Calling hook function\n");
 
 	if (hook->hook_fn(info, cpuid, 
 			  (uint32_t *)&(info->vm_regs.rax), 
@@ -298,12 +335,12 @@ int v3_handle_cpuid(struct guest_info * info) {
 			  (uint32_t *)&(info->vm_regs.rcx), 
 			  (uint32_t *)&(info->vm_regs.rdx), 
 			  hook->private_data) == -1) {
-	    PrintError("Error in cpuid handler for 0x%x\n", cpuid);
+	    PrintError(info->vm_info, info, "Error in cpuid handler for 0x%x\n", cpuid);
 	    return -1;
 	}
     }
 
-    //    PrintDebug("Cleaning up register contents\n");
+    //    PrintDebug(info->vm_info, info, "Cleaning up register contents\n");
 
     info->vm_regs.rax &= 0x00000000ffffffffLL;
     info->vm_regs.rbx &= 0x00000000ffffffffLL;