Commit b114588c authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

target/s390x: Add remaining switches to compile with --disable-tcg 



Adding some CONFIG_TCG tests to be finally able to compile QEMU
on s390x also without TCG.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1500886370-14572-6-git-send-email-thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent cded4014

target/s390x/Makefile.objs

+3 −3
Original line number Diff line number Diff line 
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

target/s390x/cpu.c

+4 −0
Original line number Diff line number Diff line
@@ -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,9 +430,11 @@ 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;