[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.10 13/14] target/s390x: Add remaining switches
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.10 13/14] target/s390x: Add remaining switches to compile with --disable-tcg |
Date: |
Tue, 25 Jul 2017 11:40:25 +0200 |
From: Thomas Huth <address@hidden>
Adding some CONFIG_TCG tests to be finally able to compile QEMU
on s390x also without TCG.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/Makefile.objs | 6 +++---
target/s390x/cpu.c | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs
index cc2b4c9257..f42cd1f9cc 100644
--- a/target/s390x/Makefile.objs
+++ b/target/s390x/Makefile.objs
@@ -1,6 +1,6 @@
-obj-y += translate.o helper.o cpu.o interrupt.o
-obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o
-obj-y += gdbstub.o cpu_models.o cpu_features.o excp_helper.o
+obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o
+obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o
+obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o
obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o
obj-$(CONFIG_KVM) += kvm.o
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index accef03234..489bc25334 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -417,7 +417,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
cc->reset = s390_cpu_full_reset;
cc->class_by_name = s390_cpu_class_by_name,
cc->has_work = s390_cpu_has_work;
+#ifdef CONFIG_TCG
cc->do_interrupt = s390_cpu_do_interrupt;
+#endif
cc->dump_state = s390_cpu_dump_state;
cc->set_pc = s390_cpu_set_pc;
cc->gdb_read_register = s390_cpu_gdb_read_register;
@@ -428,10 +430,12 @@ static void s390_cpu_class_init(ObjectClass *oc, void
*data)
cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;
cc->vmsd = &vmstate_s390_cpu;
cc->write_elf64_note = s390_cpu_write_elf64_note;
+#ifdef CONFIG_TCG
cc->cpu_exec_interrupt = s390_cpu_exec_interrupt;
cc->debug_excp_handler = s390x_cpu_debug_excp_handler;
cc->do_unaligned_access = s390x_cpu_do_unaligned_access;
#endif
+#endif
cc->disas_set_info = s390_cpu_disas_set_info;
cc->gdb_num_core_regs = S390_NUM_CORE_REGS;
--
2.13.3
- [Qemu-devel] [PULL for-2.10 02/14] vfio/ccw: fix initialization of the Object DeviceState pointer in the common base-device, (continued)
- [Qemu-devel] [PULL for-2.10 02/14] vfio/ccw: fix initialization of the Object DeviceState pointer in the common base-device, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 03/14] s390/cpumodel: remove KSS from the default model of z14, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 04/14] target/s390x: drop BE_BIT(), Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 06/14] target/s390x: introduce (test|set)_be_bit, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 05/14] target/s390x: indicate query subfunction in s390_fill_feat_block, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 07/14] s390x/kvm: better comment regarding zPCI feature availability, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 08/14] target/s390x: improve baselining if certain base features are missing, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 09/14] target/s390x: Move s390_cpu_dump_state() to helper.c, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 10/14] target/s390x: Move diag helpers to a separate file, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 11/14] target/s390x: Rework program_interrupt() and related functions, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 13/14] target/s390x: Add remaining switches to compile with --disable-tcg,
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.10 12/14] target/s390x: Move exception-related functions to a new excp_helper.c file, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PULL for-2.10 14/14] s390x/css: fix ilen in IO instruction handlers, Cornelia Huck, 2017/07/25
- Re: [Qemu-devel] [PULL for-2.10 00/14] A set of s390x patches, no-reply, 2017/07/25
- Re: [Qemu-devel] [PULL for-2.10 00/14] A set of s390x patches, Peter Maydell, 2017/07/25