Commit ae71ed86 authored by Like Xu's avatar Like Xu Committed by Eduardo Habkost
Browse files

hw/s390x: Replace global smp variables with machine smp properties 



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: default avatarLike Xu <like.xu@linux.intel.com>
Message-Id: <20190518205428.90532-7-like.xu@linux.intel.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
[ehabkost: fix build failure at VCPU_IRQ_BUF_SIZE]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>

fixup! hw/s390x: Replace global smp variables with machine smp properties

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent c4473127

hw/s390x/s390-virtio-ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

hw/s390x/sclp.c

+1 −1
Original line number Diff line number Diff line
@@ -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());

target/s390x/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -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,

target/s390x/excp_helper.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

        }

target/s390x/kvm.c

+6 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
 * Needs to be big enough to contain max_cpus emergency signals

 * and in addition NR_LOCAL_IRQS interrupts

 */

#define VCPU_IRQ_BUF_SIZE (sizeof(struct kvm_s390_irq) * \

#define VCPU_IRQ_BUF_SIZE(max_cpus) (sizeof(struct kvm_s390_irq) * \

                                     (max_cpus + NR_LOCAL_IRQS))



static CPUWatchpoint hw_watchpoint;
@@ -362,9 +362,10 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu) 


int kvm_arch_init_vcpu(CPUState *cs)

{

    unsigned int max_cpus = MACHINE(qdev_get_machine())->smp.max_cpus;

    S390CPU *cpu = S390_CPU(cs);

    kvm_s390_set_cpu_state(cpu, cpu->env.cpu_state);

    cpu->irqstate = g_malloc0(VCPU_IRQ_BUF_SIZE);

    cpu->irqstate = g_malloc0(VCPU_IRQ_BUF_SIZE(max_cpus));

    return 0;

}
@@ -1950,9 +1951,10 @@ int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state) 


void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu)

{

    unsigned int max_cpus = MACHINE(qdev_get_machine())->smp.max_cpus;

    struct kvm_s390_irq_state irq_state = {

        .buf = (uint64_t) cpu->irqstate,

        .len = VCPU_IRQ_BUF_SIZE,

        .len = VCPU_IRQ_BUF_SIZE(max_cpus),

    };

    CPUState *cs = CPU(cpu);

    int32_t bytes;