diff options
| -rw-r--r-- | src/arch/arm/kvm/armv8_cpu.cc | 8 | ||||
| -rw-r--r-- | src/arch/arm/kvm/base_cpu.cc | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/arch/arm/kvm/armv8_cpu.cc b/src/arch/arm/kvm/armv8_cpu.cc index 08b901123..67e2e465e 100644 --- a/src/arch/arm/kvm/armv8_cpu.cc +++ b/src/arch/arm/kvm/armv8_cpu.cc @@ -268,7 +268,13 @@ ArmV8KvmCPU::updateThreadContext() for (int i = 0; i < NUM_XREGS; ++i) { const auto value(getOneRegU64(kvmXReg(i))); DPRINTF(KvmContext, " X%i := 0x%x\n", i, value); - tc->setIntReg(INTREG_X0 + i, value); + // KVM64 returns registers in 64-bit layout. If we are in aarch32 + // mode, we need to map these to banked ARM32 registers. + if (inAArch64(tc)) { + tc->setIntReg(INTREG_X0 + i, value); + } else { + tc->setIntRegFlat(IntReg64Map[INTREG_X0 + i], value); + } } for (const auto &ri : intRegMap) { diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc index e511fd661..e25112cae 100644 --- a/src/arch/arm/kvm/base_cpu.cc +++ b/src/arch/arm/kvm/base_cpu.cc @@ -79,6 +79,9 @@ BaseArmKvmCPU::startup() memset(&target_config, 0, sizeof(target_config)); vm.kvmArmPreferredTarget(target_config); + if (!((ArmSystem *)system)->highestELIs64()) { + target_config.features[0] |= (1 << KVM_ARM_VCPU_EL1_32BIT); + } kvmArmVCpuInit(target_config); } |