[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/29] hw/s390x: Replace global smp variables with ma
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 06/29] hw/s390x: Replace global smp variables with machine smp properties |
Date: |
Thu, 27 Jun 2019 22:55:43 -0300 |
From: Like Xu <address@hidden>
The global smp variables in s390x are replaced with smp machine properties.
A local variable of the same name would be introduced in the declaration
phase if it's used widely in the context OR replace it on the spot if it's
only used once. No semantic changes.
Signed-off-by: Like Xu <address@hidden>
Message-Id: <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 3 ++-
hw/s390x/sclp.c | 2 +-
target/s390x/cpu.c | 3 +++
target/s390x/excp_helper.c | 5 +++++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index e09bf8f1b6..5b6a9a4e55 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -84,7 +84,7 @@ static void s390_init_cpus(MachineState *machine)
/* initialize possible_cpus */
mc->possible_cpu_arch_ids(machine);
- for (i = 0; i < smp_cpus; i++) {
+ for (i = 0; i < machine->smp.cpus; i++) {
s390x_new_cpu(machine->cpu_type, i, &error_fatal);
}
}
@@ -411,6 +411,7 @@ static CpuInstanceProperties
s390_cpu_index_to_props(MachineState *ms,
static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)
{
int i;
+ unsigned int max_cpus = ms->smp.max_cpus;
if (ms->possible_cpus) {
g_assert(ms->possible_cpus && ms->possible_cpus->len == max_cpus);
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 4510a800cb..fac7c3bb6c 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -64,7 +64,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
prepare_cpu_entries(sclp, read_info->entries, &cpu_count);
read_info->entries_cpu = cpu_to_be16(cpu_count);
read_info->offset_cpu = cpu_to_be16(offsetof(ReadInfo, entries));
- read_info->highest_cpu = cpu_to_be16(max_cpus - 1);
+ read_info->highest_cpu = cpu_to_be16(machine->smp.max_cpus - 1);
read_info->ibc_val = cpu_to_be32(s390_get_ibc_val());
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index f2d93644d5..cafb8fe3f0 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -37,6 +37,7 @@
#include "hw/qdev-properties.h"
#ifndef CONFIG_USER_ONLY
#include "hw/hw.h"
+#include "hw/boards.h"
#include "sysemu/arch_init.h"
#include "sysemu/sysemu.h"
#include "sysemu/tcg.h"
@@ -197,6 +198,8 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
}
#if !defined(CONFIG_USER_ONLY)
+ MachineState *ms = MACHINE(qdev_get_machine());
+ unsigned int max_cpus = ms->smp.max_cpus;
if (cpu->env.core_id >= max_cpus) {
error_setg(&err, "Unable to add CPU with core-id: %" PRIu32
", maximum core-id: %d", cpu->env.core_id,
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index 202456cdc5..892f659d5a 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -31,6 +31,7 @@
#ifndef CONFIG_USER_ONLY
#include "sysemu/sysemu.h"
#include "hw/s390x/s390_flic.h"
+#include "hw/boards.h"
#endif
void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t
code,
@@ -315,6 +316,10 @@ static void do_ext_interrupt(CPUS390XState *env)
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;
}
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/29] Machine next patches, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 02/29] machine: Refactor smp-related call chains to pass MachineState, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 01/29] hw/boards: Add struct CpuTopology to MachineState, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 03/29] general: Replace global smp variables with smp machine properties, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 05/29] hw/riscv: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 04/29] hw/ppc: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 06/29] hw/s390x: Replace global smp variables with machine smp properties,
Eduardo Habkost <=
- [Qemu-devel] [PULL 07/29] hw/i386: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 09/29] hw: Replace global smp variables with MachineState for all remaining archs, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 08/29] hw/arm: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 10/29] vl.c: Replace smp global variables with smp machine properties, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 11/29] i386: Add die-level cpu topology to x86CPU on PCMachine, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 12/29] hw/i386: Adjust nr_dies with configured smp_dies for PCMachine, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 16/29] machine: show if CLI option '-numa node, mem' is supported in QAPI schema, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 13/29] i386/cpu: Consolidate die-id validity in smp context, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 15/29] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size(), Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 14/29] i386: Update new x86_apicid parsing rules with die_offset support, Eduardo Habkost, 2019/06/27