diff --git a/accel/tcg/internal-common.h b/accel/tcg/internal-common.h
index 853d1b5..333c690 100644
--- a/accel/tcg/internal-common.h
+++ b/accel/tcg/internal-common.h
@@ -18,6 +18,7 @@ extern int64_t max_delay;
 extern int64_t max_advance;
 
 extern bool one_insn_per_tb;
+extern uint16_t max_insns_per_tb;
 
 extern bool icount_align_option;
 
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index bbc733a..e6d0d53 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -53,6 +53,7 @@ struct TCGState {
 
     OnOffAuto mttcg_enabled;
     bool one_insn_per_tb;
+    uint16_t max_insns_per_tb;
     int splitwx_enabled;
     unsigned long tb_size;
 };
@@ -84,6 +85,7 @@ static void tcg_accel_instance_init(Object *obj)
 }
 
 bool one_insn_per_tb;
+uint16_t max_insns_per_tb;
 
 #ifndef CONFIG_USER_ONLY
 static void tcg_vm_change_state(void *opaque, bool running, RunState state)
@@ -257,6 +259,33 @@ static void tcg_set_one_insn_per_tb(Object *obj, bool value, Error **errp)
     qatomic_set(&one_insn_per_tb, value);
 }
 
+static void tcg_get_max_insns_per_tb(Object *obj, Visitor *v,
+                                     const char *name, void *opaque,
+                                     Error **errp)
+{
+    TCGState *s = TCG_STATE(obj);
+    uint32_t value = s->max_insns_per_tb;
+    visit_type_uint32(v, name, &value, errp);
+}
+
+static void tcg_set_max_insns_per_tb(Object *obj, Visitor *v,
+                                     const char *name, void *opaque,
+                                     Error **errp)
+{
+    TCGState *s = TCG_STATE(obj);
+    uint32_t value;
+
+    if (!visit_type_uint32(v, name, &value, errp)) {
+        return;
+    }
+    if (value > 512) {
+        error_setg(errp, "max-insns-per-tb must be 0-512 (0 = default)");
+        return;
+    }
+    s->max_insns_per_tb = value;
+    qatomic_set(&max_insns_per_tb, value);
+}
+
 static void tcg_accel_class_init(ObjectClass *oc, const void *data)
 {
     AccelClass *ac = ACCEL_CLASS(oc);
@@ -287,6 +316,14 @@ static void tcg_accel_class_init(ObjectClass *oc, const void *data)
                                    tcg_set_one_insn_per_tb);
     object_class_property_set_description(oc, "one-insn-per-tb",
         "Only put one guest insn in each translation block");
+
+    object_class_property_add(oc, "max-insns-per-tb", "uint32",
+                              &uint32_type_info,
+                              tcg_get_max_insns_per_tb,
+                              tcg_set_max_insns_per_tb,
+                              NULL, NULL);
+    object_class_property_set_description(oc, "max-insns-per-tb",
+        "Max guest insns per translation block (0=default, 1-512)");
 }
 
 static const TypeInfo tcg_accel_type = {
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 2083f42..b4ffcad 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -173,6 +173,12 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
     db->is_jmp = DISAS_NEXT;
     db->num_insns = 0;
     db->max_insns = *max_insns;
+    {
+        uint16_t soft_limit = qatomic_read(&max_insns_per_tb);
+        if (soft_limit > 0 && db->max_insns > soft_limit) {
+            db->max_insns = soft_limit;
+        }
+    }
     db->insn_start = NULL;
     db->fake_insn = false;
     db->host_addr[0] = host_pc;
