From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsqQ-0001N6-RF for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXsqP-0006Fy-Mc for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:05:54 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:56804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsqP-0006Fu-B7 for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:05:53 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Dec 2011 11:05:52 -0000 Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pB6B5oec1855608 for ; Tue, 6 Dec 2011 11:05:50 GMT Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pB6B5oSM010363 for ; Tue, 6 Dec 2011 04:05:50 -0700 From: Stefan Hajnoczi Date: Tue, 6 Dec 2011 11:01:11 +0000 Message-Id: <1323169274-31657-17-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1323169274-31657-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1323169274-31657-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 16/19] Rename get_tls to tls_var List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jan Kiszka , Anthony Liguori , Stefan Hajnoczi From: Jan Kiszka 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 7246a67..9d78715 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 5b70f10..b92ea9d 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 -- 1.7.7.3