derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-arm: Fix compile error in kvm (#784)

Browse Source 
The addition of std::optional in #732 caused a compile error. This
change fixes the error by checking to see if the value is present and
panicing otherwise.

Change-Id: I46c3fb76eb0e14ba7bede7c336293fbe9add8c84

Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
This commit is contained in:
Jason Lowe-Power
2024-01-19 07:59:59 -08:00
committed by GitHub
parent f56459470a
commit a555449c12
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/arch/arm/kvm/gic.cc
View File

@@ -252,8 +252,11 @@ RegVal
KvmKernelGicV3::readCpu(const ArmISA::Affinity &aff,
ArmISA::MiscRegIndex misc_reg)
{
auto sys_reg = ArmISA::encodeAArch64SysReg(misc_reg).packed();
return getGicReg<RegVal>(KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS, aff, sys_reg);
std::optional<ArmISA::MiscRegNum64> sys_reg =
ArmISA::encodeAArch64SysReg(misc_reg);
panic_if(!sys_reg.has_value(), "Invalid system register");
return getGicReg<RegVal>(KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS, aff,
sys_reg.value().packed());
}
void
@@ -274,8 +277,11 @@ KvmKernelGicV3::writeCpu(const ArmISA::Affinity &aff,
ArmISA::MiscRegIndex misc_reg,
RegVal data)
{
auto sys_reg = ArmISA::encodeAArch64SysReg(misc_reg).packed();
setGicReg<RegVal>(KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS, aff, sys_reg, data);
std::optional<ArmISA::MiscRegNum64> sys_reg =
ArmISA::encodeAArch64SysReg(misc_reg);
panic_if(!sys_reg.has_value(), "Invalid system register");
setGicReg<RegVal>(KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS, aff,
sys_reg.value().packed(), data);
}
template <class Types>