From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WksTB-0006dW-G5 for qemu-devel@nongnu.org; Thu, 15 May 2014 06:01:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WksSw-00062f-5j for qemu-devel@nongnu.org; Thu, 15 May 2014 06:00:57 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:52993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WksSv-00062D-9n for qemu-devel@nongnu.org; Thu, 15 May 2014 06:00:42 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 May 2014 20:00:38 +1000 From: Alexey Kardashevskiy Date: Thu, 15 May 2014 19:59:54 +1000 Message-Id: <1400147999-4793-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1400147999-4793-1-git-send-email-aik@ozlabs.ru> References: <1400147999-4793-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v2 3/8] 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 | 7 +++++++ hw/intc/xics_kvm.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 7065978..83a809e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -521,11 +521,18 @@ static void ics_reset(DeviceState *dev) { ICSState *ics = ICS(dev); int i; + uint8_t flags[ics->nr_irqs]; + + for (i = 0; i < ics->nr_irqs; i++) { + flags[i] = ics->irqs[i].flags; + } memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); + for (i = 0; i < ics->nr_irqs; i++) { ics->irqs[i].priority = 0xff; ics->irqs[i].saved_priority = 0xff; + ics->irqs[i].flags = flags[i]; } } diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 8719a88..6fa2412 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -271,11 +271,18 @@ static void ics_kvm_reset(DeviceState *dev) { ICSState *ics = ICS(dev); int i; + uint8_t flags[ics->nr_irqs]; + + for (i = 0; i < ics->nr_irqs; i++) { + flags[i] = ics->irqs[i].flags; + } memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); + for (i = 0; i < ics->nr_irqs; i++) { ics->irqs[i].priority = 0xff; ics->irqs[i].saved_priority = 0xff; + ics->irqs[i].flags = flags[i]; } ics_set_kvm_state(ics, 1); -- 1.9.rc0