summaryrefslogtreecommitdiffstats
path: root/hw/intc
diff options
context:
space:
mode:
authorAlexey Kardashevskiy2014-02-13 02:08:35 +0100
committerAndreas Färber2014-03-13 03:49:48 +0100
commitfb0e843a11abae5b959a4b02be7aef617c023b4e (patch)
tree302fc34f089b463d642fe952f2eec0e2935e46d8 /hw/intc
parentpseries: Update SLOF firmware image to qemu-slof-20140304 (diff)
downloadqemu-fb0e843a11abae5b959a4b02be7aef617c023b4e.tar.gz
qemu-fb0e843a11abae5b959a4b02be7aef617c023b4e.tar.xz
qemu-fb0e843a11abae5b959a4b02be7aef617c023b4e.zip
xics-kvm: Fix reset function
Currently interrupt priorities are set to 0 (highest) at the very beginning of the guest execution which is not correct and makes the guest produce random interrupt error messages such as: "Interrupt 0x1001 (real) is invalid, disabling it". This also prevents interrupt states from correct migration. This initializes priority to 0xFF as the emulated XICS does. Suggested-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/intc')
-rw-r--r--hw/intc/xics_kvm.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index a5bbc2406d..c93dae053d 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -269,7 +269,16 @@ static void ics_kvm_set_irq(void *opaque, int srcno, int val)
static void ics_kvm_reset(DeviceState *dev)
{
- ics_set_kvm_state(ICS(dev), 1);
+ 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].priority = 0xff;
+ ics->irqs[i].saved_priority = 0xff;
+ }
+
+ ics_set_kvm_state(ics, 1);
}
static void ics_kvm_realize(DeviceState *dev, Error **errp)