From patchwork Thu Jan 20 16:04:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:39:10 -0000 Delivered-To: patches@linaro.org Received: by 10.147.124.10 with SMTP id b10cs130789yan; Thu, 20 Jan 2011 08:05:11 -0800 (PST) Received: by 10.216.19.139 with SMTP id n11mr2053840wen.78.1295539496869; Thu, 20 Jan 2011 08:04:56 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id f28si12984677wej.108.2011.01.20.08.04.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 Jan 2011 08:04:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1Pfx0G-0001of-Oe; Thu, 20 Jan 2011 16:04:52 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Himanshu Chauhan , Aurelien Jarno Subject: [PATCH] hw/pl190.c: Fix writing of default vector address Date: Thu, 20 Jan 2011 16:04:52 +0000 Message-Id: <1295539492-6960-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 The PL190 implementation keeps the default vector address in vect_addr[16], but we weren't using this for writes to the DEFVECTADDR register. As a result of this fix the default_addr structure member is unused and we can delete it. Reported-by: Himanshu Chauhan Signed-off-by: Peter Maydell --- (This patch addresses Aurelien's comments on Himanshu's patch from November: http://patchwork.ozlabs.org/patch/69768/) hw/pl190.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/hw/pl190.c b/hw/pl190.c index 17c279b..75f2ba1 100644 --- a/hw/pl190.c +++ b/hw/pl190.c @@ -21,7 +21,6 @@ typedef struct { uint32_t soft_level; uint32_t irq_enable; uint32_t fiq_select; - uint32_t default_addr; uint8_t vect_control[16]; uint32_t vect_addr[PL190_NUM_PRIO]; /* Mask containing interrupts with higher priority than this one. */ @@ -186,7 +185,7 @@ static void pl190_write(void *opaque, target_phys_addr_t offset, uint32_t val) s->priority = s->prev_prio[s->priority]; break; case 13: /* DEFVECTADDR */ - s->default_addr = val; + s->vect_addr[16] = val; break; case 0xc0: /* ITCR */ if (val) { @@ -252,7 +251,6 @@ static const VMStateDescription vmstate_pl190 = { VMSTATE_UINT32(soft_level, pl190_state), VMSTATE_UINT32(irq_enable, pl190_state), VMSTATE_UINT32(fiq_select, pl190_state), - VMSTATE_UINT32(default_addr, pl190_state), VMSTATE_UINT8_ARRAY(vect_control, pl190_state, 16), VMSTATE_UINT32_ARRAY(vect_addr, pl190_state, PL190_NUM_PRIO), VMSTATE_UINT32_ARRAY(prio_mask, pl190_state, PL190_NUM_PRIO+1),