updated to 64 bits based on the wrong f#@$%ing trunk

[palacios.git] / palacios / src / palacios / vmm_emulator.c

diff --git a/palacios/src/palacios/vmm_emulator.c b/palacios/src/palacios/vmm_emulator.c
index 73a3565..3294aa0 100644 (file)
--- a/palacios/src/palacios/vmm_emulator.c
+++ b/palacios/src/palacios/vmm_emulator.c
@@ -1,3 +1,22 @@
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #include <palacios/vmm.h>
 #include <palacios/vmm_emulator.h>
 #include <palacios/vm_guest_mem.h>
@@ -121,7 +140,7 @@ int v3_emulate_memory_read(struct guest_info * info, addr_t read_gva,
                           int (*read)(addr_t read_addr, void * dst, uint_t length, void * priv_data), 
                           addr_t read_gpa, void * private_data) {
   struct basic_instr_info instr_info;
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct emulated_page * data_page = V3_Malloc(sizeof(struct emulated_page));
   addr_t data_addr_offset = PT32_PAGE_OFFSET(read_gva);
@@ -204,7 +223,7 @@ int v3_emulate_memory_write(struct guest_info * info, addr_t write_gva,
                            addr_t write_gpa, void * private_data) {
 
   struct basic_instr_info instr_info;
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct write_region * write_op = V3_Malloc(sizeof(struct write_region ));
   struct emulated_page * data_page = V3_Malloc(sizeof(struct emulated_page));