target/arm: Install ARMISARegisters from kvm host

The ID registers are replacing (some of) the feature bits.
We need (some of) these values to determine the set of data
to be handled during migration.

Signed-off-by: Richard Henderson <[email protected]>
Message-id: 20181113180154[email protected]
Reviewed-by: Peter Maydell <[email protected]>
Signed-off-by: Peter Maydell <[email protected]>

diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 09a86e2820b0f4df19dc1f519a33afa2f0ac70ed..44dd0ce6ce9c6feab1f20f972fcd1ee45adff871 100644 (file)
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -158,6 +158,7 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu)
 
     cpu->kvm_target = arm_host_cpu_features.target;
     cpu->dtb_compatible = arm_host_cpu_features.dtb_compatible;
+    cpu->isar = arm_host_cpu_features.isar;
     env->features = arm_host_cpu_features.features;
 }
 

diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h
index 21c0129da24a3ae49e972f6f86982aad11f5ebb6..6393455b1d00c6ac01bdd81dd4dc7acb4532c19b 100644 (file)
--- a/target/arm/kvm_arm.h
+++ b/target/arm/kvm_arm.h
@@ -183,6 +183,7 @@ void kvm_arm_destroy_scratch_host_vcpu(int *fdarray);
  * by asking the host kernel)
  */
 typedef struct ARMHostCPUFeatures {
+    ARMISARegisters isar;
     uint64_t features;
     uint32_t target;
     const char *dtb_compatible;