Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

diff --git a/palacios/src/devices/vga.c b/palacios/src/devices/vga.c
index 29b7378..6e5687c 100644 (file)
--- a/palacios/src/devices/vga.c
+++ b/palacios/src/devices/vga.c
@@ -1194,7 +1194,7 @@ static int vga_write(struct guest_info * core,
 #endif
                    // rotate data right
                    if (ror) { 
-                       data = (data>>ror) | data<<(8-ror);
+                       data = (data>>ror) | (data<<(8-ror));
                    }
                    
 #if DEBUG_DEEP_MEM
@@ -1384,7 +1384,7 @@ static int vga_write(struct guest_info * core,
                uint8_t data = ((uint8_t *)src)[i];
 
                if (ror) {
-                   data = (data>>ror) | data<<(8-ror);
+                   data = (data>>ror) | (data<<(8-ror));
                }
 
                uint8_t bm = vga->vga_graphics_controller.vga_bit_mask & data;

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 980ce99..4b5b0a9 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -667,11 +667,12 @@ int v3_start_svm_guest(struct guest_info * info) {
        }
 
        
-/*
+
        if ((info->num_exits % 5000) == 0) {
            V3_Print("SVM Exit number %d\n", (uint32_t)info->num_exits);
+           v3_print_guest_state(info);
        }
-*/
+
        
     }