openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alexey Kardashevskiy 2014-05-30 19:34:14 +10:00 committed by Alexander Graf
parent 641c349352
commit a7e519a8cf
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/intc/xics.c
View File

@ -520,11 +520,18 @@ static void ics_reset(DeviceState *dev)
{ {
ICSState *ics = ICS(dev); ICSState *ics = ICS(dev);
int i; 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); memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs);
for (i = 0; i < ics->nr_irqs; i++) { for (i = 0; i < ics->nr_irqs; i++) {
ics->irqs[i].priority = 0xff; ics->irqs[i].priority = 0xff;
ics->irqs[i].saved_priority = 0xff; ics->irqs[i].saved_priority = 0xff;
ics->irqs[i].flags = flags[i];
} }
} }

7
hw/intc/xics_kvm.c
View File

@ -267,11 +267,18 @@ static void ics_kvm_reset(DeviceState *dev)
{ {
ICSState *ics = ICS(dev); ICSState *ics = ICS(dev);
int i; 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); memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs);
for (i = 0; i < ics->nr_irqs; i++) { for (i = 0; i < ics->nr_irqs; i++) {
ics->irqs[i].priority = 0xff; ics->irqs[i].priority = 0xff;
ics->irqs[i].saved_priority = 0xff; ics->irqs[i].saved_priority = 0xff;
ics->irqs[i].flags = flags[i];
} }
ics_set_kvm_state(ics, 1); ics_set_kvm_state(ics, 1);