From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: ehabkost@redhat.com, peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH] tcg: Avoid setting tcg_initialize if !CONFIG_TCG
Date: Thu, 26 Oct 2017 15:58:14 +0200 [thread overview]
Message-ID: <20171026135814.20773-1-richard.henderson@linaro.org> (raw)
Fix the build for --disable-tcg.
Fixes: 55c3ceef61fcf06fc98ddc752b7cce788ce7680b
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/cpu.c | 2 ++
target/i386/cpu.c | 2 ++
target/mips/cpu.c | 2 ++
target/ppc/translate_init.c | 2 ++
target/s390x/cpu.c | 2 ++
5 files changed, 10 insertions(+)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 056284985d..a7f03eabe8 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1760,7 +1760,9 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
#endif
cc->disas_set_info = arm_disas_set_info;
+#ifdef CONFIG_TCG
cc->tcg_initialize = arm_translate_init;
+#endif
}
static void cpu_register(const ARMCPUInfo *info)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 53ec94ac9b..2f556c0ea3 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -4212,7 +4212,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
#endif
cc->cpu_exec_enter = x86_cpu_exec_enter;
cc->cpu_exec_exit = x86_cpu_exec_exit;
+#ifdef CONFIG_TCG
cc->tcg_initialize = tcg_x86_init;
+#endif
dc->user_creatable = true;
}
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 0ae70288dd..80812f3e08 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -198,7 +198,9 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)
cc->vmsd = &vmstate_mips_cpu;
#endif
cc->disas_set_info = mips_cpu_disas_set_info;
+#ifdef CONFIG_TCG
cc->tcg_initialize = mips_tcg_init;
+#endif
cc->gdb_num_core_regs = 73;
cc->gdb_stop_before_watchpoint = true;
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index 13436e4760..61a9552c1c 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -10578,7 +10578,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
#ifndef CONFIG_USER_ONLY
cc->virtio_is_big_endian = ppc_cpu_is_big_endian;
#endif
+#ifdef CONFIG_TCG
cc->tcg_initialize = ppc_translate_init;
+#endif
dc->fw_name = "PowerPC,UNKNOWN";
}
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 824dfd6b65..ae3cee91a2 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -497,7 +497,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
#endif
#endif
cc->disas_set_info = s390_cpu_disas_set_info;
+#ifdef CONFIG_TCG
cc->tcg_initialize = s390x_translate_init;
+#endif
cc->gdb_num_core_regs = S390_NUM_CORE_REGS;
cc->gdb_core_xml_file = "s390x-core64.xml";
--
2.13.6
next reply other threads:[~2017-10-26 13:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 13:58 Richard Henderson [this message]
2017-10-26 14:05 ` [Qemu-devel] [PATCH] tcg: Avoid setting tcg_initialize if !CONFIG_TCG Eduardo Habkost
2017-10-26 17:37 ` Emilio G. Cota
2017-10-26 18:57 ` Philippe Mathieu-Daudé
2017-10-26 19:03 ` Philippe Mathieu-Daudé
2017-10-27 22:54 ` Paolo Bonzini
2017-10-28 7:48 ` Thomas Huth
2017-10-27 7:03 ` Peter Maydell
2017-10-30 3:25 ` Philippe Mathieu-Daudé
2017-10-30 4:06 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171026135814.20773-1-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=ehabkost@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.