minor fixes

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 9987fe5..cf75842 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -139,8 +139,8 @@ struct guest_info {
   v3_io_map_t io_map;
 
   struct v3_msr_map msr_map;
-  // device_map
 
+  // device_map
   struct vmm_dev_mgr  dev_mgr;
 
   struct v3_host_events host_event_hooks;
@@ -165,15 +165,12 @@ struct guest_info {
 
   struct v3_msr guest_efer;
 
-
-  struct v3_msr shadow_cstar;
-  struct v3_msr shadow_star;
-  struct v3_msr shadow_lstar;
-  struct v3_msr shadow_syscall_mask;
-  
-
-  /* TEMP */
-  //ullong_t exit_tsc;
+  /* Do we need these ? */
+  struct v3_msr guest_star;
+  struct v3_msr guest_lstar;
+  struct v3_msr guest_cstar;
+  struct v3_msr guest_syscall_mask;
+  struct v3_msr guest_gs_base;
 
 };
 

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index b95edd4..d897fa0 100644 (file)
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -130,8 +130,6 @@ static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_in
        
        shadow_efer->lma = 1;
        shadow_efer->lme = 1;
-       
-       v3_print_segments(info);
 
        PrintDebug("New EFER %p\n", (void *)*(addr_t *)(shadow_efer));
       }
@@ -515,7 +513,6 @@ int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) {
   guest_efer->value = src.value;
 
        
-  v3_print_segments(info);
   // We have to handle long mode writes....
 
   /* 

diff --git a/palacios/src/palacios/vmm_xed.c b/palacios/src/palacios/vmm_xed.c
index 6d5a97c..e6de1e1 100644 (file)
--- a/palacios/src/palacios/vmm_xed.c
+++ b/palacios/src/palacios/vmm_xed.c
@@ -608,7 +608,7 @@ static int get_memory_operand(struct guest_info * info,  xed_decoded_inst_t * xe
 
 static int xed_reg_to_v3_reg(struct guest_info * info, xed_reg_enum_t xed_reg, addr_t * v3_reg, uint_t * reg_len) {
 
-  PrintError("Xed Register: %s\n", xed_reg_enum_t2str(xed_reg));
+  // PrintError("Xed Register: %s\n", xed_reg_enum_t2str(xed_reg));
 
   switch (xed_reg) {
   case XED_REG_INVALID: