X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=51145218067f79a0d1dbc517330b024bc5791f83;hb=8c767ddb04d3ac42d080d9f9f5f40196d6f8f217;hp=10742f72be0fd156f03a450fd056175dc4085530;hpb=fc14d48378cdc90085786bccf4a5230261a0d315;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 10742f7..5114521 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -50,7 +50,7 @@ static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * pr
 
   memcpy(dst, &foo, length);
 
-  PrintDebug("Passthrough mem read returning: %d (length=%d)\n", foo + (guest_addr & 0xfff), length);
+  PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), length);
   return length;
 }
 
@@ -105,14 +105,14 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     void * guest_mem =  V3_AllocPages(num_pages);
 
     PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
-    memcpy(guest_mem, config_ptr->rombios, config_ptr->rombios_size);
+    memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
 
     add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
     
-    PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", 
-	       ROMBIOS_START, 
-	       ROMBIOS_START + (num_pages * PAGE_SIZE), 
-	       guest_mem);
+    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
+	       (void *)ROMBIOS_START, 
+	       (void *)ROMBIOS_START + (num_pages * PAGE_SIZE), 
+	       (void *)guest_mem);
   }
 
 
@@ -122,14 +122,14 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     void * guest_mem =  V3_AllocPages(num_pages);
 
     PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
-    memcpy(guest_mem, config_ptr->vgabios, config_ptr->vgabios_size);
+    memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
 
     add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
     
-    PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", 
-	       VGABIOS_START, 
-	       VGABIOS_START + (num_pages * PAGE_SIZE), 
-	       guest_mem);
+    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
+	       (void *)VGABIOS_START, 
+	       (void *)VGABIOS_START + (num_pages * PAGE_SIZE), 
+	       (void *)guest_mem);
   }
 
       //