diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2014-05-30 19:34:14 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-06-27 13:48:26 +0200 |
| commit | a7e519a8cf12c9f08a28339743b648dde38cd9d3 (patch) | |
| tree | 3164efff15ce7e12ac5afecf961b5b999e535e0f /hw/intc | |
| parent | 641c349352cd3846ad164357d5a831e748d13536 (diff) | |
| download | qemu-a7e519a8cf12c9f08a28339743b648dde38cd9d3.zip qemu-a7e519a8cf12c9f08a28339743b648dde38cd9d3.tar.gz qemu-a7e519a8cf12c9f08a28339743b648dde38cd9d3.tar.bz2 | |
xics: Disable flags reset on xics reset
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 <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/xics.c | 7 | ||||
| -rw-r--r-- | hw/intc/xics_kvm.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index c02feaf..634101a 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -520,11 +520,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 5461454..20b19e9 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -267,11 +267,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); |