Re: [Qemu-devel] [PATCH 5/5] target/s390x: Add remaining switches to compile with --disable-tcg

[Thomas Huth]

On 19.07.2017 20:13, Richard Henderson wrote:
> On 07/19/2017 02:54 AM, Thomas Huth wrote:
>>       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
> 
> These ought to be if (tcg_enabled()), surely.

I've tried that, but it does not work: s390_cpu_class_init() is called
before tcg_exec_init() (where tcg_allowed is initialized). So
tcg_enabled() always returns 0 here. ... so I guess I better keep the
patch in the current shape, especially since x86 is doing it this way,
too: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=79c664f6

 Thomas