X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_io.c;h=1910f01bd5edff19e8662ca57a2746bb58e9697b;hb=df510a069624b48dda1ad66368954f028757b1bc;hp=9b02a0a4c26e3e6f46880f17097fd04855bfcf0d;hpb=5e5c8ee949fa45116d58b904fc11aab082f61607;p=palacios.git

diff --git a/palacios/src/palacios/vmx_io.c b/palacios/src/palacios/vmx_io.c
index 9b02a0a..1910f01 100644
--- a/palacios/src/palacios/vmx_io.c
+++ b/palacios/src/palacios/vmx_io.c
@@ -33,7 +33,7 @@
 
 /* Same as SVM */
 static int update_map(struct v3_vm_info * vm, uint16_t port, int hook_read, int hook_write) {
-    uchar_t * bitmap = (uint8_t *)(vm->io_map.arch_data);
+    uint8_t * bitmap = (uint8_t *)(vm->io_map.arch_data);
     int major = port / 8;
     int minor = port % 8;
 
@@ -47,9 +47,17 @@ static int update_map(struct v3_vm_info * vm, uint16_t port, int hook_read, int
 }
 
 int v3_init_vmx_io_map(struct v3_vm_info * vm) {
+    void *temp;
+
     vm->io_map.update_map = update_map;
-    
-    vm->io_map.arch_data = V3_VAddr(V3_AllocPages(2));
+
+    temp = V3_AllocPages(2);
+    if (!temp) {
+        PrintError(vm, VCORE_NONE, "Cannot allocate io bitmap\n");
+	return -1;
+    }
+		   
+    vm->io_map.arch_data = V3_VAddr(temp);
     memset(vm->io_map.arch_data, 0xff, PAGE_SIZE_4KB * 2);
 
     v3_refresh_io_map(vm);
@@ -72,17 +80,16 @@ int v3_handle_vmx_io_in(struct guest_info * core, struct vmx_exit_info * exit_in
 
     read_size = io_qual.access_size + 1;
 
-    PrintDebug("IN of %d bytes on port %d (0x%x)\n", read_size, io_qual.port, io_qual.port);
+    PrintDebug(core->vm_info, core, "IN of %d bytes on port %d (0x%x)\n", read_size, io_qual.port, io_qual.port);
 
     if (hook == NULL) {
-	PrintDebug("IN operation on unhooked IO port 0x%x\n", io_qual.port);
+	PrintDebug(core->vm_info, core, "IN operation on unhooked IO port 0x%x - returning zeros\n", io_qual.port);
+	core->vm_regs.rax >>= 8*read_size;
+	core->vm_regs.rax <<= 8*read_size;
 
-	/* What are the HW semantics for an IN on an invalid port? 
-	 *  Do we need to clear the register value or leave it untouched??? 
-	 */
     } else {
 	if (hook->read(core, io_qual.port, &(core->vm_regs.rax), read_size, hook->priv_data) != read_size) {
-	    PrintError("Read failure for IN on port %x\n", io_qual.port);
+	    PrintError(core->vm_info, core, "Read failure for IN on port %x\n", io_qual.port);
 	    return -1;
 	}
     }
@@ -100,13 +107,13 @@ int v3_handle_vmx_io_ins(struct guest_info * core, struct vmx_exit_info * exit_i
     addr_t guest_va = exit_info->guest_linear_addr;
     addr_t host_addr = 0;
     int rdi_change = 0;
-    ulong_t rep_num = 1;
+    uint32_t rep_num = 1;
     struct rflags * flags = (struct rflags *)&(core->ctrl_regs.rflags);
 
     hook = v3_get_io_hook(core->vm_info, io_qual.port);
 
 
-    PrintDebug("INS on port 0x%x\n", io_qual.port);
+    PrintDebug(core->vm_info, core, "INS on port 0x%x\n", io_qual.port);
 
     read_size = io_qual.access_size + 1;
 
@@ -120,7 +127,7 @@ int v3_handle_vmx_io_ins(struct guest_info * core, struct vmx_exit_info * exit_i
         } else if(instr_info.addr_size == 2) {
             rep_num = core->vm_regs.rcx & 0xffffffffffffffffLL;
         } else {
-            PrintDebug("Unknown INS address size!\n");
+            PrintDebug(core->vm_info, core, "Unknown INS address size!\n");
             return -1;
         }
     }
@@ -131,26 +138,25 @@ int v3_handle_vmx_io_ins(struct guest_info * core, struct vmx_exit_info * exit_i
         rdi_change = read_size;
     }
 
-    PrintDebug("INS size=%d for %ld steps\n", read_size, rep_num);
+    PrintDebug(core->vm_info, core, "INS size=%d for %u steps\n", read_size, rep_num);
 
 
 
     if (v3_gva_to_hva(core, guest_va, &host_addr) == -1) {
-        PrintError("Could not convert Guest VA to host VA\n");
+        PrintError(core->vm_info, core, "Could not convert Guest VA to host VA\n");
         return -1;
     }
 
     do {
 
 	if (hook == NULL) {
-	    PrintDebug("INS operation on unhooked IO port 0x%x\n", io_qual.port);
+	    PrintDebug(core->vm_info, core, "INS operation on unhooked IO port 0x%x - returning zeros\n", io_qual.port);
 	    
-            /* What are the HW semantics for an INS on an invalid port? 
-	     *  Do we need to clear the memory region or leave it untouched??? 
-	     */	    
+	    memset((char*)host_addr,0,read_size);
+
 	} else {
 	    if (hook->read(core, io_qual.port, (char *)host_addr, read_size, hook->priv_data) != read_size) {
-		PrintError("Read Failure for INS on port 0x%x\n", io_qual.port);
+		PrintError(core->vm_info, core, "Read Failure for INS on port 0x%x\n", io_qual.port);
 		return -1;
 	    }
 	}
@@ -183,13 +189,13 @@ int v3_handle_vmx_io_out(struct guest_info * core, struct vmx_exit_info * exit_i
 
     write_size = io_qual.access_size + 1;
     
-    PrintDebug("OUT of %d bytes on port %d (0x%x)\n", write_size, io_qual.port, io_qual.port);
+    PrintDebug(core->vm_info, core, "OUT of %d bytes on port %d (0x%x)\n", write_size, io_qual.port, io_qual.port);
 
     if (hook == NULL) {
-	PrintDebug("OUT operation on unhooked IO port 0x%x\n", io_qual.port);
+	PrintDebug(core->vm_info, core, "OUT operation on unhooked IO port 0x%x - ignored\n", io_qual.port);
     } else {  
 	if (hook->write(core, io_qual.port, &(core->vm_regs.rax), write_size, hook->priv_data) != write_size) {
-	    PrintError("Write failure for out on port %x\n",io_qual.port);
+	    PrintError(core->vm_info, core, "Write failure for out on port %x\n",io_qual.port);
 	    return -1;
 	}
     }
@@ -208,12 +214,12 @@ int v3_handle_vmx_io_outs(struct guest_info * core, struct vmx_exit_info * exit_
     addr_t guest_va = exit_info->guest_linear_addr;
     addr_t host_addr;
     int rsi_change;
-    ulong_t rep_num = 1;
+    uint32_t rep_num = 1;
     struct rflags * flags = (struct rflags *)&(core->ctrl_regs.rflags);
 
     hook = v3_get_io_hook(core->vm_info, io_qual.port);
 
-    PrintDebug("OUTS on port 0x%x\n", io_qual.port);
+    PrintDebug(core->vm_info, core, "OUTS on port 0x%x\n", io_qual.port);
 
     write_size = io_qual.access_size + 1;
 
@@ -228,7 +234,7 @@ int v3_handle_vmx_io_outs(struct guest_info * core, struct vmx_exit_info * exit_
         } else if(instr_info.addr_size == 2) {
             rep_num = core->vm_regs.rcx & 0xffffffffffffffffLL;
         } else {
-            PrintDebug("Unknown INS address size!\n");
+            PrintDebug(core->vm_info, core, "Unknown INS address size!\n");
             return -1;
         }
     }
@@ -241,20 +247,20 @@ int v3_handle_vmx_io_outs(struct guest_info * core, struct vmx_exit_info * exit_
 
 
 
-    PrintDebug("OUTS size=%d for %ld steps\n", write_size, rep_num);
+    PrintDebug(core->vm_info, core, "OUTS size=%d for %u steps\n", write_size, rep_num);
 
     if (v3_gva_to_hva(core, guest_va, &host_addr) == -1) {
-        PrintError("Could not convert guest VA to host VA\n");
+        PrintError(core->vm_info, core, "Could not convert guest VA to host VA\n");
         return -1;
     }
 
     do {
 
 	if (hook == NULL) {
-	    PrintDebug("OUTS operation on unhooked IO port 0x%x\n", io_qual.port);
+	    PrintDebug(core->vm_info, core, "OUTS operation on unhooked IO port 0x%x - ignored\n", io_qual.port);
 	} else {
 	    if (hook->write(core, io_qual.port, (char *)host_addr, write_size, hook->priv_data) != write_size) {
-		PrintError("Read failure for INS on port 0x%x\n", io_qual.port);
+		PrintError(core->vm_info, core, "Read failure for INS on port 0x%x\n", io_qual.port);
 		return -1;
 	    }
 	}