diff -r f1d504c8ede4 -r 85949465c50b src/arch/arm/kvm/armv8_cpu.cc
--- a/src/arch/arm/kvm/armv8_cpu.cc	Wed Feb 22 17:35:16 2017 -0800
+++ b/src/arch/arm/kvm/armv8_cpu.cc	Fri Feb 24 17:24:10 2017 -0800
@@ -269,7 +269,13 @@
     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 -r f1d504c8ede4 -r 85949465c50b src/arch/arm/kvm/base_cpu.cc
--- a/src/arch/arm/kvm/base_cpu.cc	Wed Feb 22 17:35:16 2017 -0800
+++ b/src/arch/arm/kvm/base_cpu.cc	Fri Feb 24 17:24:10 2017 -0800
@@ -79,6 +79,9 @@
     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);
 }