[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] tcg: disable tcg in CPUX86State struct
From: |
Yang Zhong |
Subject: |
[Qemu-devel] [PATCH 13/15] tcg: disable tcg in CPUX86State struct |
Date: |
Wed, 21 Jun 2017 18:19:59 +0800 |
Add the CONFIG_TCG for CPU_COMMON_TLB in the CPUX86State struct.
Signed-off-by: Yang Zhong <address@hidden>
---
include/exec/cpu-defs.h | 4 +++-
target/i386/cpu.h | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
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/target/i386/cpu.h b/target/i386/cpu.h
index 229b216..d67b601 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -52,7 +52,9 @@
#include "exec/cpu-defs.h"
+#ifdef CONFIG_TCG
#include "fpu/softfloat.h"
+#endif
#define R_EAX 0
#define R_ECX 1
@@ -1130,8 +1132,9 @@ typedef struct CPUX86State {
/* Fields up to this point are cleared by a CPU reset */
struct {} end_reset_fields;
-
+#ifdef CONFIG_TCG
CPU_COMMON
+#endif
/* Fields after CPU_COMMON are preserved across CPU reset. */
--
1.9.1
- [Qemu-devel] [PATCH 07/15] tcg: move cpu_sync_bndcs_hflags() function, (continued)
- [Qemu-devel] [PATCH 07/15] tcg: move cpu_sync_bndcs_hflags() function, Yang Zhong, 2017/06/21
- [Qemu-devel] [PATCH 10/15] tcg: move tb related lock functions, Yang Zhong, 2017/06/21
- [Qemu-devel] [PATCH 09/15] tcg: add the tcg-stub.c file into accel/stubs/, Yang Zhong, 2017/06/21
- [Qemu-devel] [PATCH 11/15] tcg: split cpu_set_mxcsr()/cpu_set_fpuc(), Yang Zhong, 2017/06/21
- Re: [Qemu-devel] [PATCH 11/15] tcg: split cpu_set_mxcsr()/cpu_set_fpuc(), Richard Henderson, 2017/06/21
- [Qemu-devel] [PATCH 12/15] tcg: remove inline definition of flush_icache_range(), Yang Zhong, 2017/06/21
- [Qemu-devel] [PATCH 13/15] tcg: disable tcg in CPUX86State struct,
Yang Zhong <=
- [Qemu-devel] [PATCH 15/15] tcg: add the CONFIG_TCG into Makefiles, Yang Zhong, 2017/06/21
- [Qemu-devel] [PATCH 14/15] tcg: add the CONFIG_TCG for header, Yang Zhong, 2017/06/21
- Re: [Qemu-devel] [PATCH 00/15] add disable-tcg option for x86 build, no-reply, 2017/06/21
- Re: [Qemu-devel] [PATCH 00/15] add disable-tcg option for x86 build, Paolo Bonzini, 2017/06/21