소스 검색

hw/intc/arm_gicv3_its: Don't call post_load on reset

From the very beginning, post_load() was called from common
reset. This is not standard and obliged to discriminate the
reset case from the restore case using the iidr value.

Let's get rid of that call.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1511883692-11511-2-git-send-email-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Eric Auger 7 년 전
부모
커밋
7e7244796b
2개의 변경된 파일0개의 추가작업 그리고 6개의 파일을 삭제
  1. 0 2
      hw/intc/arm_gicv3_its_common.c
  2. 0 4
      hw/intc/arm_gicv3_its_kvm.c

+ 0 - 2
hw/intc/arm_gicv3_its_common.c

@@ -131,8 +131,6 @@ static void gicv3_its_common_reset(DeviceState *dev)
     s->creadr = 0;
     s->creadr = 0;
     s->iidr = 0;
     s->iidr = 0;
     memset(&s->baser, 0, sizeof(s->baser));
     memset(&s->baser, 0, sizeof(s->baser));
-
-    gicv3_its_post_load(s, 0);
 }
 }
 
 
 static void gicv3_its_common_class_init(ObjectClass *klass, void *data)
 static void gicv3_its_common_class_init(ObjectClass *klass, void *data)

+ 0 - 4
hw/intc/arm_gicv3_its_kvm.c

@@ -155,10 +155,6 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
 {
 {
     int i;
     int i;
 
 
-    if (!s->iidr) {
-        return;
-    }
-
     kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
     kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
                       GITS_IIDR, &s->iidr, true, &error_abort);
                       GITS_IIDR, &s->iidr, true, &error_abort);