summaryrefslogtreecommitdiff
path: root/include/qom
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-08-26 00:17:58 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-09-09 15:34:53 +0200
commitf240eb6fdcf63a5600e15fb44c6960586459a97f (patch)
tree2b354a527fe9e1bc8e0c1597374e75c318a8e138 /include/qom
parent9373e63297c43752f9cf085feb7f5aed57d959f8 (diff)
downloadqemu-f240eb6fdcf63a5600e15fb44c6960586459a97f.tar.gz
qemu-f240eb6fdcf63a5600e15fb44c6960586459a97f.tar.bz2
qemu-f240eb6fdcf63a5600e15fb44c6960586459a97f.zip
remove qemu/tls.h
TLS is now required on all platforms, so DECLARE_TLS/DEFINE_TLS is not needed anymore. Removing it does not break Windows because of the previous patch. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qom')
-rw-r--r--include/qom/cpu.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 39712ab7cb..8612655a27 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -28,7 +28,6 @@
#include "exec/memattrs.h"
#include "qemu/queue.h"
#include "qemu/thread.h"
-#include "qemu/tls.h"
#include "qemu/typedefs.h"
typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
@@ -333,8 +332,7 @@ extern struct CPUTailQ cpus;
QTAILQ_FOREACH_REVERSE(cpu, &cpus, CPUTailQ, node)
#define first_cpu QTAILQ_FIRST(&cpus)
-DECLARE_TLS(CPUState *, current_cpu);
-#define current_cpu tls_var(current_cpu)
+extern __thread CPUState *current_cpu;
/**
* cpu_paging_enabled: