X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=508f2215d0abf29f5967725093e6052eeb36d4e3;hb=47f2237e5c6a71a63f04bc3dc0215fbbe2f40490;hp=b2b7969cb94778d23ff73c3a43573f569c57c830;hpb=ad78e7627af59b2ebbfebdd05b479a021174efe4;p=palacios-OLD.git

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index b2b7969..508f221 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -1215,7 +1215,7 @@ static int apic_read(struct guest_info * core, addr_t guest_addr, void * dst, ui
 	*val_ptr = *(((uint8_t *)&val) + byte_addr);
 
     } else if ((length == 2) && 
-	       ((reg_addr & 0x3) == 0x3)) {
+	       ((reg_addr & 0x3) != 0x3)) {
 	uint_t byte_addr = reg_addr & 0x3;
 	uint16_t * val_ptr = (uint16_t *)dst;
 	*val_ptr = *(((uint16_t *)&val) + byte_addr);
@@ -1357,6 +1357,8 @@ static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, u
 	    apic->tmr_cur_cnt = op_val;
 	    break;
 	case TMR_DIV_CFG_OFFSET:
+	    PrintDebug("apic %u: core %u: setting tmr_div_cfg to 0x%x\n",
+		       apic->lapic_id.val, core->vcpu_id, op_val);
 	    apic->tmr_div_cfg.val = op_val;
 	    break;
 
@@ -1650,6 +1652,19 @@ static void apic_update_time(struct guest_info * core,
 	}
     
 	if (apic->tmr_vec_tbl.tmr_mode == APIC_TMR_PERIODIC) {
+	    static unsigned int nexits = 0;
+	    static unsigned int missed_ints = 0;
+
+	    nexits++;
+	    missed_ints += tmr_ticks / apic->tmr_init_cnt;
+
+	    if ((missed_ints > 0) && (nexits >= 5000)) {
+	        V3_Print("apic %u: core %u: missed %u timer interrupts total in last %u exits.\n",
+		         apic->lapic_id.val, core->vcpu_id, missed_ints, nexits); 
+		missed_ints = 0;
+		nexits = 0;
+	    }
+
 	    tmr_ticks = tmr_ticks % apic->tmr_init_cnt;
 	    apic->tmr_cur_cnt = apic->tmr_init_cnt - tmr_ticks;
 	}