[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/15] vl: add CONFIG_TCG for tcg related code
From: |
Yang Zhong |
Subject: |
[Qemu-devel] [PATCH 02/15] vl: add CONFIG_TCG for tcg related code |
Date: |
Wed, 21 Jun 2017 18:19:48 +0800 |
Need to disable the tcg related code in the vl.c if the
disable-tcg option is added into ./configure command.
Signed-off-by: Yang Zhong <address@hidden>
---
cpus.c | 3 ++-
vl.c | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/cpus.c b/cpus.c
index 14bb8d5..a86ea10 100644
--- a/cpus.c
+++ b/cpus.c
@@ -170,7 +170,7 @@ bool mttcg_enabled;
* implicit memory order requirements which would likely slow things
* down a lot.
*/
-
+#ifdef CONFIG_TCG
static bool check_tcg_memory_orders_compatible(void)
{
#if defined(TCG_GUEST_DEFAULT_MO) && defined(TCG_TARGET_DEFAULT_MO)
@@ -223,6 +223,7 @@ void qemu_tcg_configure(QemuOpts *opts, Error **errp)
mttcg_enabled = default_mttcg_enabled();
}
}
+#endif
/* The current number of executed instructions is based on what we
* originally budgeted minus the current state of the decrementing
diff --git a/vl.c b/vl.c
index 59fea15..a01faf9 100644
--- a/vl.c
+++ b/vl.c
@@ -3738,8 +3738,13 @@ int main(int argc, char **argv, char **envp)
}
break;
case QEMU_OPTION_no_kvm:
+#ifdef CONFIG_TCG
olist = qemu_find_opts("machine");
qemu_opts_parse_noisily(olist, "accel=tcg", false);
+#else
+ error_report("TCG is disabled");
+ exit(1);
+#endif
break;
case QEMU_OPTION_no_kvm_pit: {
error_report("warning: ignoring deprecated option");
@@ -3915,10 +3920,15 @@ int main(int argc, char **argv, char **envp)
configure_rtc(opts);
break;
case QEMU_OPTION_tb_size:
+#ifdef CONFIG_TCG
tcg_tb_size = strtol(optarg, NULL, 0);
if (tcg_tb_size < 0) {
tcg_tb_size = 0;
}
+#else
+ error_report("TCG is disabled");
+ exit(1);
+#endif
break;
case QEMU_OPTION_icount:
icount_opts = qemu_opts_parse_noisily(qemu_find_opts("icount"),
@@ -4457,7 +4467,9 @@ int main(int argc, char **argv, char **envp)
qemu_opts_del(icount_opts);
}
+#ifdef CONFIG_TCG
qemu_tcg_configure(accel_opts, &error_fatal);
+#endif
if (default_net) {
QemuOptsList *net = qemu_find_opts("net");
--
1.9.1
- [Qemu-devel] [PATCH 00/15] add disable-tcg option for x86 build, Yang Zhong, 2017/06/21
- [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Yang Zhong, 2017/06/21
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Richard Henderson, 2017/06/21
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Thomas Huth, 2017/06/22
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Paolo Bonzini, 2017/06/22
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Thomas Huth, 2017/06/22
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Paolo Bonzini, 2017/06/22
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Thomas Huth, 2017/06/22
- Re: [Qemu-devel] [PATCH 01/15] configure: add the disable-tcg option, Paolo Bonzini, 2017/06/22
[Qemu-devel] [PATCH 02/15] vl: add CONFIG_TCG for tcg related code,
Yang Zhong <=
[Qemu-devel] [PATCH 04/15] tcg: change tcg_enabled(), Yang Zhong, 2017/06/21
[Qemu-devel] [PATCH 05/15] tcg: move page_size_init() function, Yang Zhong, 2017/06/21
[Qemu-devel] [PATCH 03/15] tcg: tcg_handle_interrupt() function, Yang Zhong, 2017/06/21
[Qemu-devel] [PATCH 06/15] kvmvapic: remove tcg related code, Yang Zhong, 2017/06/21
[Qemu-devel] [PATCH 08/15] tcg: make cpu_get_fp80()/cpu_set_fp80() static, Yang Zhong, 2017/06/21