|
 |
9bac43 |
From c63efdd05d3c8c79fceba7bb55c4946685e2a191 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Auger Eric <eric.auger@redhat.com>
|
|
|
9bac43 |
Date: Tue, 28 Nov 2017 15:14:05 +0100
|
|
|
9bac43 |
Subject: [PATCH 4/9] hw/intc/arm_gicv3_its: Don't call post_load on reset
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Auger Eric <eric.auger@redhat.com>
|
|
|
9bac43 |
Message-id: <1511882048-11256-5-git-send-email-eric.auger@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77941
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-ma PATCH 4/7] hw/intc/arm_gicv3_its: Don't call post_load on reset
|
|
|
9bac43 |
Bugzilla: 1513323
|
|
|
9bac43 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
>From the very beginning, post_load() was called from common
|
|
|
9bac43 |
reset. This is not standard and obliged to discriminate the
|
|
|
9bac43 |
reset case from the restore case using the iidr value.
|
|
|
9bac43 |
|
|
|
9bac43 |
Let's get rid of that call.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
9bac43 |
|
|
|
9bac43 |
---
|
|
|
9bac43 |
|
|
|
9bac43 |
v4 -> V5:
|
|
|
9bac43 |
- added Peter's R-b
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/intc/arm_gicv3_its_common.c | 2 --
|
|
|
9bac43 |
hw/intc/arm_gicv3_its_kvm.c | 4 ----
|
|
|
9bac43 |
2 files changed, 6 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c
|
|
|
9bac43 |
index 68b20fc..a029e3c 100644
|
|
|
9bac43 |
--- a/hw/intc/arm_gicv3_its_common.c
|
|
|
9bac43 |
+++ b/hw/intc/arm_gicv3_its_common.c
|
|
|
9bac43 |
@@ -129,8 +129,6 @@ static void gicv3_its_common_reset(DeviceState *dev)
|
|
|
9bac43 |
s->creadr = 0;
|
|
|
9bac43 |
s->iidr = 0;
|
|
|
9bac43 |
memset(&s->baser, 0, sizeof(s->baser));
|
|
|
9bac43 |
-
|
|
|
9bac43 |
- gicv3_its_post_load(s, 0);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static void gicv3_its_common_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
|
|
|
9bac43 |
index 6fb45df..b1b322b 100644
|
|
|
9bac43 |
--- a/hw/intc/arm_gicv3_its_kvm.c
|
|
|
9bac43 |
+++ b/hw/intc/arm_gicv3_its_kvm.c
|
|
|
9bac43 |
@@ -155,10 +155,6 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
int i;
|
|
|
9bac43 |
|
|
|
9bac43 |
- if (!s->iidr) {
|
|
|
9bac43 |
- return;
|
|
|
9bac43 |
- }
|
|
|
9bac43 |
-
|
|
|
9bac43 |
kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
|
|
|
9bac43 |
GITS_IIDR, &s->iidr, true, &error_abort);
|
|
|
9bac43 |
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|