Changeset 12869 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 1, 2008 3:11:15 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37263

Message:

fixed Ubuntu crash in debug VBox (although true reason why we're
getting bogus values into MMIO writes sometimes is still unclear)

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -789 +789 @@
     memset(s->tmr, 0, sizeof(s->tmr));
     memset(s->irr, 0, sizeof(s->irr));
-    for(i = 0; i < APIC_LVT_NB; i++)
-        s->lvt[i] = 1 << 16; /* mask LVT */
     s->esr = 0;
     memset(s->icr, 0, sizeof(s->icr));
@@ -1561 +1559 @@
             default:
                 index = (s->ioregsel - 0x10) >> 1;
-                if (index >= 0 && index < IOAPIC_NUM_PINS) {
+                if (index >= 0 && index < IOAPIC_NUM_PINS) {                    
                     if (s->ioregsel & 1) {
                         s->ioredtbl[index] &= 0xffffffff;
                         s->ioredtbl[index] |= (uint64_t)val << 32;
                     } else {
-                        s->ioredtbl[index] &= ~0xffffffffULL;
-                        s->ioredtbl[index] |= val;
+#ifdef VBOX
+                        /* According to IOAPIC spec, vectors should be from 0x10 to 0xfe */
+                        uint8_t vec = val & 0xff;
+                        if ((vec >= 0x10) && (vec < 0xff))
+                        {
+                            s->ioredtbl[index] &= ~0xffffffffULL;
+                            s->ioredtbl[index] |= val;
+                        }
+                        else
+                        {
+                            LogRel(("IOAPIC BUG: bad vector writing %x(sel=%x) to %d\n", val, s->ioregsel, index));
+                        }
                     }
+#else
+                    s->ioredtbl[index] &= ~0xffffffffULL;
+                    s->ioredtbl[index] |= val;
+#endif
                     ioapic_service(s);
                 }