[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/42] tcg: add CONFIG_TCG guards in headers
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 35/42] tcg: add CONFIG_TCG guards in headers |
Date: |
Wed, 5 Jul 2017 09:14:38 +0200 |
From: Yang Zhong <address@hidden>
Add CONFIG_TCG around TLB-related functions and structure declarations.
Some of these functions are defined in ./accel/tcg/cputlb.c, which will
not be linked in if TCG is disabled, and have no stubs; therefore, their
callers will also be compiled out for --disable-tcg.
Signed-off-by: Yang Zhong <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/cpu-defs.h | 4 +++-
include/exec/exec-all.h | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 5f4e303..bc8e7f8 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -25,7 +25,9 @@
#include "qemu/host-utils.h"
#include "qemu/queue.h"
+#ifdef CONFIG_TCG
#include "tcg-target.h"
+#endif
#ifndef CONFIG_USER_ONLY
#include "exec/hwaddr.h"
#endif
@@ -54,7 +56,7 @@ typedef uint64_t target_ulong;
#error TARGET_LONG_SIZE undefined
#endif
-#if !defined(CONFIG_USER_ONLY)
+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
/* use a fully associative victim tlb of 8 entries */
#define CPU_VTLB_SIZE 8
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 0b56432..8096d64 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -82,6 +82,9 @@ void cpu_reloading_memory_map(void);
* Note that with KVM only one address space is supported.
*/
void cpu_address_space_init(CPUState *cpu, AddressSpace *as, int asidx);
+#endif
+
+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
/* cputlb.c */
/**
* tlb_flush_page:
--
1.8.3.1
- [Qemu-devel] [PULL 27/42] tcg: move page_size_init() function, (continued)
- [Qemu-devel] [PULL 27/42] tcg: move page_size_init() function, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 28/42] cpu: move interrupt handling out of translate-common.c, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 29/42] tcg: make tcg_allowed global, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 32/42] tcg: add the tcg-stub.c file into accel/stubs/, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 31/42] vapic: use tcg_enabled, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 30/42] monitor: disable "info jit" and "info opcount" if !TCG, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 33/42] tcg: move tb_lock out of translate-all.h, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 37/42] target/i386: move cpu_sync_bndcs_hflags() function, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 34/42] exec: elide calls to tb_lock and tb_unlock, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 36/42] tcg: add the CONFIG_TCG into Makefiles, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 35/42] tcg: add CONFIG_TCG guards in headers,
Paolo Bonzini <=
- [Qemu-devel] [PULL 38/42] target/i386: make cpu_get_fp80()/cpu_set_fp80() static, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 41/42] target/i386: add the tcg_enabled() in target/i386/, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 39/42] target/i386: split cpu_set_mxcsr() and make cpu_set_fpuc() inline, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 42/42] target/i386: add the CONFIG_TCG into Makefiles, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 40/42] target/i386: move TLB refill function out of helper.c, Paolo Bonzini, 2017/07/05
- Re: [Qemu-devel] [PULL 00/42] Misc changes for 2017-07-05, Peter Maydell, 2017/07/06
- Re: [Qemu-devel] [PULL 00/42] Misc changes for 2017-07-05, no-reply, 2017/07/06