---

yaml --- r: 361507 b: refs/heads/master c: a2c118b h: refs/heads/master i: 361505: cc7907e 361503: 4852eaf v: v3
git-mirror · Mar 19, 2013 · 60dcb19 · 60dcb19
1 parent 440a5cd
commit 60dcb19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b79459b482e85cb7426aa7da683a9f2c97aeae1
+refs/heads/master: a2c118bfab8bc6b8bb213abfc35201e441693d55
diff --git a/trunk/virt/kvm/ioapic.c b/trunk/virt/kvm/ioapic.c
@@ -74,9 +74,12 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
 			u32 redir_index = (ioapic->ioregsel - 0x10) >> 1;
 			u64 redir_content;
 
-			ASSERT(redir_index < IOAPIC_NUM_PINS);
+			if (redir_index < IOAPIC_NUM_PINS)
+				redir_content =
+					ioapic->redirtbl[redir_index].bits;
+			else
+				redir_content = ~0ULL;
 
-			redir_content = ioapic->redirtbl[redir_index].bits;
 			result = (ioapic->ioregsel & 0x1) ?
 			    (redir_content >> 32) & 0xffffffff :
 			    redir_content & 0xffffffff;