From 59d808cf21c4b5b44e66a7a52a7e7db7749449a3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 8 Aug 2019 19:55:12 -0400 Subject: [PATCH] target/arm: Supply uc_struct instance to tcg_enabled() --- qemu/target/arm/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/target/arm/cpu.c b/qemu/target/arm/cpu.c index a4df8303..df204e73 100644 --- a/qemu/target/arm/cpu.c +++ b/qemu/target/arm/cpu.c @@ -721,7 +721,7 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err * Presence of EL2 itself is ARM_FEATURE_EL2, and of the * Security Extensions is ARM_FEATURE_EL3. */ - assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(arm_div, cpu)); + assert(!tcg_enabled(uc) || no_aa32 || cpu_isar_feature(arm_div, cpu)); set_feature(env, ARM_FEATURE_LPAE); set_feature(env, ARM_FEATURE_V7); } @@ -747,7 +747,7 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err if (arm_feature(env, ARM_FEATURE_V6)) { set_feature(env, ARM_FEATURE_V5); if (!arm_feature(env, ARM_FEATURE_M)) { - assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(jazelle, cpu)); + assert(!tcg_enabled(uc) || no_aa32 || cpu_isar_feature(jazelle, cpu)); set_feature(env, ARM_FEATURE_AUXCR); } }