jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

target/s390x: Remove duplicated ifdef macro

Commit ae71ed8610 replaced the use of global max_cpus variable
with a machine property, but introduced a unnecessary ifdef, as
this block is already in the 'not CONFIG_USER_ONLY' branch part:

86 #if defined(CONFIG_USER_ONLY)
87
...
106 #else /* !CONFIG_USER_ONLY */
107
...
292 static void do_ext_interrupt(CPUS390XState *env)
293 {
...
313 #ifndef CONFIG_USER_ONLY
314 MachineState *ms = MACHINE(qdev_get_machine());
315 unsigned int max_cpus = ms->smp.max_cpus;
316 #endif

To ease code review, remove the duplicated preprocessor macro,
and move the declarations at the beginning of the statement.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200121110349.25842-6-philmd@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>

authored by

Philippe Mathieu-Daudé and committed by
Cornelia Huck 596cc12c d6a9858d

+3 -4
+3 -4
target/s390x/excp_helper.c
··· 305 305 306 306 if ((env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) && 307 307 (env->cregs[0] & CR0_EMERGENCY_SIGNAL_SC)) { 308 + MachineState *ms = MACHINE(qdev_get_machine()); 309 + unsigned int max_cpus = ms->smp.max_cpus; 310 + 308 311 lowcore->ext_int_code = cpu_to_be16(EXT_EMERGENCY); 309 312 cpu_addr = find_first_bit(env->emergency_signals, S390_MAX_CPUS); 310 313 g_assert(cpu_addr < S390_MAX_CPUS); 311 314 lowcore->cpu_addr = cpu_to_be16(cpu_addr); 312 315 clear_bit(cpu_addr, env->emergency_signals); 313 - #ifndef CONFIG_USER_ONLY 314 - MachineState *ms = MACHINE(qdev_get_machine()); 315 - unsigned int max_cpus = ms->smp.max_cpus; 316 - #endif 317 316 if (bitmap_empty(env->emergency_signals, max_cpus)) { 318 317 env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL; 319 318 }