From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whuvt-00034U-GK for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whuvi-0002G7-Oh for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:21 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:45470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whuvh-0002F6-TS for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:10 -0400 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 May 2014 16:02:06 +1000 From: Alexey Kardashevskiy Date: Wed, 7 May 2014 16:01:55 +1000 Message-Id: <1399442518-26303-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1399442518-26303-1-git-send-email-aik@ozlabs.ru> References: <1399442518-26303-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 3/6] xics: disable flags reset on xics reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf Since islsi[] array has been merged into the ICSState struct, we must not reset flags as they tell if the interrupt is in use. Signed-off-by: Alexey Kardashevskiy --- hw/intc/xics.c | 4 +++- hw/intc/xics_kvm.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 9314654..7a64b2e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -522,10 +522,12 @@ static void ics_reset(DeviceState *dev) ICSState *ics = ICS(dev); int i; - memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); for (i = 0; i < ics->nr_irqs; i++) { + ics->irqs[i].server = 0; ics->irqs[i].priority = 0xff; ics->irqs[i].saved_priority = 0xff; + ics->irqs[i].status = 0; + /* Do not reset @flags as IRQ might be allocated */ } } diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 456fc2c..a322593 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -272,10 +272,12 @@ static void ics_kvm_reset(DeviceState *dev) ICSState *ics = ICS(dev); int i; - memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); for (i = 0; i < ics->nr_irqs; i++) { + ics->irqs[i].server = 0; ics->irqs[i].priority = 0xff; ics->irqs[i].saved_priority = 0xff; + ics->irqs[i].status = 0; + /* Do not reset @flags as IRQ might be allocated */ } ics_set_kvm_state(ics, 1); -- 1.8.4.rc4