From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPWEI-0002vi-0u for qemu-devel@nongnu.org; Wed, 12 Aug 2015 09:38:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPWEC-0002v1-V4 for qemu-devel@nongnu.org; Wed, 12 Aug 2015 09:38:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPWEC-0002uO-QU for qemu-devel@nongnu.org; Wed, 12 Aug 2015 09:38:00 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 741BB9175C for ; Wed, 12 Aug 2015 13:38:00 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-82.ams2.redhat.com [10.36.112.82]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t7CDbwRo009778 for ; Wed, 12 Aug 2015 09:37:59 -0400 From: Paolo Bonzini Date: Wed, 12 Aug 2015 15:37:57 +0200 Message-Id: <1439386677-19886-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] ioapic: fix contents of arbitration register List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The arbitration register should read to the same value as the IOAPIC id register. Fixes kvm-unit-tests ioapic.flat. Signed-off-by: Paolo Bonzini --- hw/intc/ioapic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 6ad3c66..bde52e8 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -156,15 +156,13 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) } switch (s->ioregsel) { case IOAPIC_REG_ID: + case IOAPIC_REG_ARB: val = s->id << IOAPIC_ID_SHIFT; break; case IOAPIC_REG_VER: val = IOAPIC_VERSION | ((IOAPIC_NUM_PINS - 1) << IOAPIC_VER_ENTRIES_SHIFT); break; - case IOAPIC_REG_ARB: - val = 0; - break; default: index = (s->ioregsel - IOAPIC_REG_REDTBL_BASE) >> 1; if (index >= 0 && index < IOAPIC_NUM_PINS) { -- 2.4.3