some fixes

diff --git a/geekos/src/geekos/vm.c b/geekos/src/geekos/vm.c
index 17c3499..39144b0 100644 (file)
--- a/geekos/src/geekos/vm.c
+++ b/geekos/src/geekos/vm.c
@@ -107,7 +107,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
     
     region_start += rombios->length;
 
-    vm_config.enable_profiling = 1;
+    vm_config.enable_profiling = 0;
     
     vm_config.vgabios = region_start;
     vm_config.vgabios_size = vgabios->length;

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 7871eb0..74e986e 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -81,7 +81,7 @@ struct v3_segment {
   uint_t long_mode      : 1;
   uint_t db             : 1;
   uint_t granularity    : 1;
-};
+} __attribute__((packed));
 
 
 struct v3_segments {
@@ -95,7 +95,7 @@ struct v3_segments {
   struct v3_segment gdtr;
   struct v3_segment idtr;
   struct v3_segment tr;
-};
+} ;
 
 struct shadow_page_state;
 struct emulation_state;

diff --git a/palacios/include/palacios/vmcb.h b/palacios/include/palacios/vmcb.h
index ed85de5..968873a 100644 (file)
--- a/palacios/include/palacios/vmcb.h
+++ b/palacios/include/palacios/vmcb.h
@@ -324,7 +324,7 @@ struct VMCB_State_Save_Area {
 
   //offset 0x0cb
   uchar_t cpl; // if the guest is real-mode then the CPL is forced to 0
-                                             // if the guest is virtual-mode then the CPL is forced to 3
+               // if the guest is virtual-mode then the CPL is forced to 3
 
   uint_t rsvd2;
 

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 2621fcb..653643f 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -387,7 +387,8 @@ static int start_svm_guest(struct guest_info *info) {
 
     if ((num_exits % 5000) == 0) {
       PrintDebug("SVM Exit number %d\n", num_exits);
-      v3_print_profile(info);
+      if (info->enable_profiler) 
+       v3_print_profile(info);
     }