| Message ID | 20200121110349.25842-6-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanups around the 'current_machine' global variable | expand |
On Tue, 21 Jan 2020 12:03:44 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > 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> > --- > v2: New patch > Cc: Like Xu <like.xu@linux.intel.com> > --- > target/s390x/excp_helper.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Thanks, applied.
On Tue, 21 Jan 2020 12:03:44 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > 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> > --- > v2: New patch > Cc: Like Xu <like.xu@linux.intel.com> > --- > target/s390x/excp_helper.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) I case this goes via the misc tree: Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index e70c20d363..1e9d6f20c1 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; }
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> --- v2: New patch Cc: Like Xu <like.xu@linux.intel.com> --- target/s390x/excp_helper.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)