Commit f240eb6f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9373e632

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static MemoryRegion io_mem_unassigned; 
struct CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus);

/* current CPU in the current thread. It is only valid inside

   cpu_exec() */

DEFINE_TLS(CPUState *, current_cpu);

__thread CPUState *current_cpu;

/* 0 = Do not count executed instructions.

   1 = Precise instruction counting.

   2 = Adaptive rate instruction counting.  */

include/qemu/tls.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * Abstraction layer for defining and using TLS variables

 *

 * Copyright (c) 2011 Red Hat, Inc

 * Copyright (c) 2011 Linaro Limited

 *

 * Authors:

 *  Paolo Bonzini <pbonzini@redhat.com>

 *  Peter Maydell <peter.maydell@linaro.org>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation; either version 2 of

 * the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef QEMU_TLS_H

#define QEMU_TLS_H



/* Per-thread variables. Note that we only have implementations

 * which are really thread-local on Linux; the dummy implementations

 * define plain global variables.

 *

 * This means that for the moment use should be restricted to

 * per-VCPU variables, which are OK because:

 *  - the only -user mode supporting multiple VCPU threads is linux-user

 *  - TCG system mode is single-threaded regarding VCPUs

 *  - KVM system mode is multi-threaded but limited to Linux

 *

 * TODO: proper implementations via Win32 .tls sections and

 * POSIX pthread_getspecific.

 */

#ifdef __linux__

#define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x)

#define DEFINE_TLS(type, x)  __thread __typeof__(type) 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 tls_var(x)           tls__##x

#endif



#endif

include/qom/cpu.h

+1 −3
Original line number Diff line number Diff line
@@ -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: