Message ID | 20181214031923.29527-2-richard.henderson@linaro.org |
---|---|
State | New |
Headers | show |
Series | fixup! target/arm: Move id_aa64mmfr* to ARMISARegisters | expand |
On 12/13/18 9:18 PM, Richard Henderson wrote: > I didn't get this fix pushed back into the patch set that I actually > sent last week. The patch is in target-arm.next, and I'm sure you > would have eventually seen the error in testing. > > > r~ > --- > target/arm/kvm64.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Oops, didn't clean out the directory before generating the pull. Obviously this isn't in the branch. r~
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index ad83e1479c..089af9c5f0 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -538,9 +538,9 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ARM64_SYS_REG(3, 0, 0, 6, 0)); err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64isar1, ARM64_SYS_REG(3, 0, 0, 6, 1)); - err |= read_sys_reg64(fdarray[2], &achf->isar.id_aa64mmfr0, + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64mmfr0, ARM64_SYS_REG(3, 0, 0, 7, 0)); - err |= read_sys_reg64(fdarray[2], &achf->isar.id_aa64mmfr1, + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64mmfr1, ARM64_SYS_REG(3, 0, 0, 7, 1)); /*