diff options
Diffstat (limited to 'src/arch/arm/kvm/gic.hh')
| -rw-r--r-- | src/arch/arm/kvm/gic.hh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/arm/kvm/gic.hh b/src/arch/arm/kvm/gic.hh index a2a62cd29..649bcf84e 100644 --- a/src/arch/arm/kvm/gic.hh +++ b/src/arch/arm/kvm/gic.hh @@ -44,7 +44,7 @@ #include "arch/arm/system.hh" #include "cpu/kvm/device.hh" #include "cpu/kvm/vm.hh" -#include "dev/arm/gic_pl390.hh" +#include "dev/arm/gic_v2.hh" #include "dev/platform.hh" /** @@ -168,7 +168,7 @@ class KvmKernelGicV2 : public BaseGicRegisters struct MuxingKvmGicParams; -class MuxingKvmGic : public Pl390 +class MuxingKvmGic : public GicV2 { public: // SimObject / Serializable / Drainable MuxingKvmGic(const MuxingKvmGicParams *p); @@ -182,14 +182,14 @@ class MuxingKvmGic : public Pl390 Tick read(PacketPtr pkt) override; Tick write(PacketPtr pkt) override; - public: // Pl390 + public: // GicV2 void sendInt(uint32_t num) override; void clearInt(uint32_t num) override; void sendPPInt(uint32_t num, uint32_t cpu) override; void clearPPInt(uint32_t num, uint32_t cpu) override; - protected: // Pl390 + protected: // GicV2 void updateIntState(int hint) override; protected: @@ -203,8 +203,8 @@ class MuxingKvmGic : public Pl390 bool usingKvm; /** Multiplexing implementation */ - void fromPl390ToKvm(); - void fromKvmToPl390(); + void fromGicV2ToKvm(); + void fromKvmToGicV2(); void copyGicState(BaseGicRegisters* from, BaseGicRegisters* to); |