[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] hw/intc/arm_gicv3_its: Don't abort on table save
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 7/7] hw/intc/arm_gicv3_its: Don't abort on table save failure |
Date: |
Tue, 7 Nov 2017 13:35:22 +0000 |
From: Eric Auger <address@hidden>
The ITS is not fully properly reset at the moment. Caches are
not emptied.
After a reset, in case we attempt to save the state before
the bound devices have registered their MSIs and after the
1st level table has been allocated by the ITS driver
(device BASER is valid), the first level entries are still
invalid. If the device cache is not empty (devices registered
before the reset), vgic_its_save_device_tables fails with -EINVAL.
This causes a QEMU abort().
Cc: address@hidden
Signed-off-by: Eric Auger <address@hidden>
Reported-by: wanghaibin <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/intc/arm_gicv3_its_kvm.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
index 9b00ce5..6fb45df 100644
--- a/hw/intc/arm_gicv3_its_kvm.c
+++ b/hw/intc/arm_gicv3_its_kvm.c
@@ -64,20 +64,16 @@ static void vm_change_state_handler(void *opaque, int
running,
{
GICv3ITSState *s = (GICv3ITSState *)opaque;
Error *err = NULL;
- int ret;
if (running) {
return;
}
- ret = kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
- KVM_DEV_ARM_ITS_SAVE_TABLES, NULL, true, &err);
+ kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
+ KVM_DEV_ARM_ITS_SAVE_TABLES, NULL, true, &err);
if (err) {
error_report_err(err);
}
- if (ret < 0 && ret != -EFAULT) {
- abort();
- }
}
static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
--
2.7.4
- [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2017/11/07
- [Qemu-devel] [PULL 5/7] translate.c: Fix usermode big-endian AArch32 LDREXD and STREXD, Peter Maydell, 2017/11/07
- [Qemu-devel] [PULL 4/7] hw/arm: Mark the "fsl, imx31" device with user_creatable = false, Peter Maydell, 2017/11/07
- [Qemu-devel] [PULL 1/7] arm: implement cache/shareability attribute bits for PAR registers, Peter Maydell, 2017/11/07
- [Qemu-devel] [PULL 2/7] hw/arm: Mark the "fsl, imx6" device with user_creatable = false, Peter Maydell, 2017/11/07
- [Qemu-devel] [PULL 7/7] hw/intc/arm_gicv3_its: Don't abort on table save failure,
Peter Maydell <=
- [Qemu-devel] [PULL 3/7] hw/arm: Mark the "fsl, imx25" device with user_creatable = false, Peter Maydell, 2017/11/07
- [Qemu-devel] [PULL 6/7] hw/intc/arm_gicv3_its: Fix the VM termination in vm_change_state_handler(), Peter Maydell, 2017/11/07
- Re: [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2017/11/07