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 <jason@lowepower.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>

diff --git a/src/arch/arm/kvm/gic.cc b/src/arch/arm/kvm/gic.cc
index d490265b88fe716145784c738aec648d726a0a97..887fa8d697ee63e21347e43aad6df7b956674a0f 100644 (file)
--- 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 5447e6a92ae38edf821d5686feb51f8e90a22d5d..a2a62cd2923f4b5e7e335467eaa89ed3e7af0ff7 100644 (file)
--- 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;