54a55,57
> #include <algorithm>
> #include <array>
>
165,166c168,178
< struct vcpuIntData {
< ListReg LR[NUM_LR];
---
> struct vcpuIntData : public Serializable {
> vcpuIntData()
> : vctrl(0), hcr(0), eisr(0), VMGrp0En(0), VMGrp1En(0),
> VMAckCtl(0), VMFiqEn(0), VMCBPR(0), VEM(0), VMABP(0), VMBP(0),
> VMPriMask(0)
> {
> std::fill(LR.begin(), LR.end(), 0);
> }
> virtual ~vcpuIntData() {}
>
> std::array<ListReg, NUM_LR> LR;
181a194,196
>
> void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
> void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
184c199
< struct vcpuIntData vcpuData[VGIC_CPU_MAX];
---
> struct std::array<vcpuIntData, VGIC_CPU_MAX> vcpuData;
200,201c215,216
< virtual void serialize(std::ostream &os);
< virtual void unserialize(Checkpoint *cp, const std::string &section);
---
> void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
> void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;