From 60dcb19a8326a604bf02de45d9c76a3f7099fa28 Mon Sep 17 00:00:00 2001 From: Andy Honig Date: Wed, 20 Feb 2013 14:49:16 -0800 Subject: [PATCH] --- yaml --- r: 361507 b: refs/heads/master c: a2c118bfab8bc6b8bb213abfc35201e441693d55 h: refs/heads/master i: 361505: cc7907e658561426d77c5df0814b807b0a9e048f 361503: 4852eaf1311bf16c4fb95425377214e710fa5bd9 v: v3 --- [refs] | 2 +- trunk/virt/kvm/ioapic.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e60538df4a08..b69ded6bb2c5 100644 --- 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 index ce82b9401958..5ba005c00e2f 100644 --- 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;