From 4a2dd92d7b89d00cb8afa90aa588fef44a79aa88 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 5 Dec 2011 15:18:54 +0100 Subject: [PATCH] Rename get_tls to tls_var get_tls() can serve as a lvalue as well, so 'get' might be confusing. Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- cpu-all.h | 2 +- qemu-tls.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 7246a67236..9d787151e1 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -336,7 +336,7 @@ void QEMU_NORETURN cpu_abort(CPUState *env, const char *fmt, ...) GCC_FMT_ATTR(2, 3); extern CPUState *first_cpu; DECLARE_TLS(CPUState *,cpu_single_env); -#define cpu_single_env get_tls(cpu_single_env) +#define cpu_single_env tls_var(cpu_single_env) /* Flags for use in ENV->INTERRUPT_PENDING. diff --git a/qemu-tls.h b/qemu-tls.h index 5b70f10f8f..b92ea9d7da 100644 --- a/qemu-tls.h +++ b/qemu-tls.h @@ -41,12 +41,12 @@ #ifdef __linux__ #define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x) #define DEFINE_TLS(type, x) __thread __typeof__(type) tls__##x -#define get_tls(x) tls__##x +#define tls_var(x) tls__##x #else /* Dummy implementations which define plain global variables */ #define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x) #define DEFINE_TLS(type, x) __typeof__(type) tls__##x -#define get_tls(x) tls__##x +#define tls_var(x) tls__##x #endif #endif