From 0fb142224c275d201227176a007202f3ed51211a Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 18 Sep 2017 17:13:31 -0700 Subject: [PATCH] kvm: arm: Get rid of functions which just wrap the subclasses version. The MuxingKvmGic class defined a few functions related to checkpointing which did nothing other than call the underlying Pl390 implementation. These are unnecessary in general, and are particularly unnecessary for the loadState function which is a very lightly used part of the checkpointing interface. It's not actually defined in Pl390 either, and falls through to the underlying implementation. Change-Id: I84aae13d4966df0f4fdd1a72aee0bf1af01392ff Reviewed-on: https://gem5-review.googlesource.com/4760 Reviewed-by: Jason Lowe-Power Reviewed-by: Curtis Dunham Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- src/arch/arm/kvm/gic.cc | 19 ------------------- src/arch/arm/kvm/gic.hh | 5 ----- 2 files changed, 24 deletions(-) diff --git a/src/arch/arm/kvm/gic.cc b/src/arch/arm/kvm/gic.cc index d490265b8..887fa8d69 100644 --- a/src/arch/arm/kvm/gic.cc +++ b/src/arch/arm/kvm/gic.cc @@ -183,12 +183,6 @@ MuxingKvmGic::~MuxingKvmGic() { } -void -MuxingKvmGic::loadState(CheckpointIn &cp) -{ - Pl390::loadState(cp); -} - void MuxingKvmGic::startup() { @@ -221,19 +215,6 @@ MuxingKvmGic::drainResume() } } -void -MuxingKvmGic::serialize(CheckpointOut &cp) const -{ - // drain() already ensured Pl390 updated with KvmGic state if necessary - Pl390::serialize(cp); -} - -void -MuxingKvmGic::unserialize(CheckpointIn &cp) -{ - Pl390::unserialize(cp); -} - Tick MuxingKvmGic::read(PacketPtr pkt) { diff --git a/src/arch/arm/kvm/gic.hh b/src/arch/arm/kvm/gic.hh index 5447e6a92..a2a62cd29 100644 --- a/src/arch/arm/kvm/gic.hh +++ b/src/arch/arm/kvm/gic.hh @@ -174,15 +174,10 @@ class MuxingKvmGic : public Pl390 MuxingKvmGic(const MuxingKvmGicParams *p); ~MuxingKvmGic(); - void loadState(CheckpointIn &cp) override; - void startup() override; DrainState drain() override; void drainResume() override; - void serialize(CheckpointOut &cp) const override; - void unserialize(CheckpointIn &cp) override; - public: // PioDevice Tick read(PacketPtr pkt) override; Tick write(PacketPtr pkt) override; -- 2.30.2