diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-01-21 12:03:44 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2020-01-27 12:13:09 +0100 |
| commit | 596cc12ccd6c124758dee686a67287e8584b2fc7 (patch) | |
| tree | c4b0f85d49b581effc18f3ee637cacb768a0e161 | |
| parent | d6a9858d24df4fc8633e1c3cb7bf928b80b9685c (diff) | |
| download | qemu-596cc12ccd6c124758dee686a67287e8584b2fc7.zip qemu-596cc12ccd6c124758dee686a67287e8584b2fc7.tar.gz qemu-596cc12ccd6c124758dee686a67287e8584b2fc7.tar.bz2 | |
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>
| -rw-r--r-- | target/s390x/excp_helper.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index e70c20d..1e9d6f2 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -305,15 +305,14 @@ static void do_ext_interrupt(CPUS390XState *env) if ((env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) && (env->cregs[0] & CR0_EMERGENCY_SIGNAL_SC)) { + MachineState *ms = MACHINE(qdev_get_machine()); + unsigned int max_cpus = ms->smp.max_cpus; + lowcore->ext_int_code = cpu_to_be16(EXT_EMERGENCY); cpu_addr = find_first_bit(env->emergency_signals, S390_MAX_CPUS); g_assert(cpu_addr < S390_MAX_CPUS); lowcore->cpu_addr = cpu_to_be16(cpu_addr); clear_bit(cpu_addr, env->emergency_signals); -#ifndef CONFIG_USER_ONLY - MachineState *ms = MACHINE(qdev_get_machine()); - unsigned int max_cpus = ms->smp.max_cpus; -#endif if (bitmap_empty(env->emergency_signals, max_cpus)) { env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL; } |