kvm, arm: Fix compilation errors due to API changes

The checkpoint changes, along with the SMT patches have changed a
number of APIs. Adapt the ArmKvmCPU accordingly.

diff --git a/src/arch/arm/kvm/arm_cpu.cc b/src/arch/arm/kvm/arm_cpu.cc
index cb5c4a2def4d8bf748cf787f721e2eda7fc63d65..e3f12cb9468744dc42bc9a8da5b18e6042ed4695 100644 (file)
--- a/src/arch/arm/kvm/arm_cpu.cc
+++ b/src/arch/arm/kvm/arm_cpu.cc
@@ -270,8 +270,8 @@ ArmKvmCPU::startup()
 Tick
 ArmKvmCPU::kvmRun(Tick ticks)
 {
-    bool simFIQ(interrupts->checkRaw(INT_FIQ));
-    bool simIRQ(interrupts->checkRaw(INT_IRQ));
+    bool simFIQ(interrupts[0]->checkRaw(INT_FIQ));
+    bool simIRQ(interrupts[0]->checkRaw(INT_IRQ));
 
     if (fiqAsserted != simFIQ) {
         fiqAsserted = simFIQ;

diff --git a/src/arch/arm/kvm/armv8_cpu.cc b/src/arch/arm/kvm/armv8_cpu.cc
index 071d27dd0d2a7564e5157fffb5d33f98cfa22fba..e8a77b07ba88f70820ed748884a6c457732bcb32 100644 (file)
--- a/src/arch/arm/kvm/armv8_cpu.cc
+++ b/src/arch/arm/kvm/armv8_cpu.cc
@@ -123,7 +123,7 @@ ArmV8KvmCPU::~ArmV8KvmCPU()
 }
 
 void
-ArmV8KvmCPU::dump()
+ArmV8KvmCPU::dump() const
 {
     inform("Integer registers:\n");
     inform("  PC: %s\n", getAndFormatOneReg(INT_REG(regs.pc)));

diff --git a/src/arch/arm/kvm/armv8_cpu.hh b/src/arch/arm/kvm/armv8_cpu.hh
index aee27a8a446db5d8e239400a088353f4194ebbb0..d3e390b4f4d55135c5542b679c88cda7a7b3da5a 100644 (file)
--- a/src/arch/arm/kvm/armv8_cpu.hh
+++ b/src/arch/arm/kvm/armv8_cpu.hh
@@ -83,7 +83,7 @@ class ArmV8KvmCPU : public BaseArmKvmCPU
     ArmV8KvmCPU(ArmV8KvmCPUParams *params);
     virtual ~ArmV8KvmCPU();
 
-    void dump() override;
+    void dump() const override;
 
   protected:
     void updateKvmState() override;

diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc
index 61de16900e5cedf7cc3e11e22c521991a5395581..b802cd600eb89d9089855f67a2e472047ce35ddc 100644 (file)
--- a/src/arch/arm/kvm/base_cpu.cc
+++ b/src/arch/arm/kvm/base_cpu.cc
@@ -86,8 +86,8 @@ BaseArmKvmCPU::startup()
 Tick
 BaseArmKvmCPU::kvmRun(Tick ticks)
 {
-    bool simFIQ(interrupts->checkRaw(INT_FIQ));
-    bool simIRQ(interrupts->checkRaw(INT_IRQ));
+    bool simFIQ(interrupts[0]->checkRaw(INT_FIQ));
+    bool simIRQ(interrupts[0]->checkRaw(INT_IRQ));
 
     if (fiqAsserted != simFIQ) {
         fiqAsserted = simFIQ;

diff --git a/src/arch/arm/kvm/gic.hh b/src/arch/arm/kvm/gic.hh
index f156caa6b9bcc011ab5f10debbadf8c8b198f8c4..f6360858b20f00157f52b8fd43069dc79acaff56 100644 (file)
--- a/src/arch/arm/kvm/gic.hh
+++ b/src/arch/arm/kvm/gic.hh
@@ -80,7 +80,7 @@ class KvmGic : public BaseGic
     void drainResume() override { verifyMemoryMode(); }
 
     void serialize(CheckpointOut &cp) const override;
-    void unserialize(Checkpoint *cp, const std::string &sec)  override;
+    void unserialize(CheckpointIn &cp)  override;
 
   public: // PioDevice
     AddrRangeList getAddrRanges() const { return addrRanges; }