summary refs log tree commit diff stats
path: root/cpus.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2018-06-25 14:10:56 -0300
committerEduardo Habkost <ehabkost@redhat.com>2018-06-25 14:10:56 -0300
commit0b6e9aa89e02c8b213af019aad816e00ba8243f8 (patch)
tree27eb6832830ebf44939c7b968df9044c6d4433ae /cpus.c
parent6b2942f966d5e54c37d305c80f5f98d504c2bc55 (diff)
parent35e238c9330669882487f9929e0aa97900431853 (diff)
downloadfocaccia-qemu-0b6e9aa89e02c8b213af019aad816e00ba8243f8.tar.gz
focaccia-qemu-0b6e9aa89e02c8b213af019aad816e00ba8243f8.zip
Merge branch 'master' of git://git.qemu.org/qemu into x86-next
Diffstat (limited to 'cpus.c')
-rw-r--r--cpus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpus.c b/cpus.c
index 19c5d37108..b5844b7103 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1355,6 +1355,7 @@ static int tcg_cpu_exec(CPUState *cpu)
     int64_t ti;
 #endif
 
+    assert(tcg_enabled());
 #ifdef CONFIG_PROFILER
     ti = profile_getclock();
 #endif
@@ -1397,6 +1398,7 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg)
 {
     CPUState *cpu = arg;
 
+    assert(tcg_enabled());
     rcu_register_thread();
     tcg_register_thread();
 
@@ -1631,6 +1633,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
 {
     CPUState *cpu = arg;
 
+    assert(tcg_enabled());
     g_assert(!use_icount);
 
     rcu_register_thread();
@@ -1854,6 +1857,7 @@ static void qemu_tcg_init_vcpu(CPUState *cpu)
     static QemuThread *single_tcg_cpu_thread;
     static int tcg_region_inited;
 
+    assert(tcg_enabled());
     /*
      * Initialize TCG regions--once. Now is a good time, because:
      * (1) TCG's init context, prologue and target globals have been set up.