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

hw: Replace global smp variables with MachineState for all remaining archs 



The global smp variables in alpha/hppa/mips/openrisc/sparc*/xtensa codes
are replaced with smp properties from MachineState.

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>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-Id: <20190518205428.90532-10-like.xu@linux.intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent cc7d44c2

hw/alpha/dp264.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void clipper_init(MachineState *machine) 
    char *palcode_filename;

    uint64_t palcode_entry, palcode_low, palcode_high;

    uint64_t kernel_entry, kernel_low, kernel_high;

    unsigned int smp_cpus = machine->smp.cpus;



    /* Create up to 4 cpus.  */

    memset(cpus, 0, sizeof(cpus));

hw/hppa/machine.c

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static void machine_hppa_init(MachineState *machine) 
    MemoryRegion *ram_region;

    MemoryRegion *cpu_region;

    long i;

    unsigned int smp_cpus = machine->smp.cpus;



    ram_size = machine->ram_size;
@@ -242,6 +243,7 @@ static void machine_hppa_init(MachineState *machine) 


static void hppa_machine_reset(MachineState *ms)

{

    unsigned int smp_cpus = ms->smp.cpus;

    int i;



    qemu_devices_reset();

hw/mips/boston.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static void boston_mach_init(MachineState *machine) 
                          sizeof(s->cps), TYPE_MIPS_CPS);

    object_property_set_str(OBJECT(&s->cps), machine->cpu_type, "cpu-type",

                            &err);

    object_property_set_int(OBJECT(&s->cps), smp_cpus, "num-vp", &err);

    object_property_set_int(OBJECT(&s->cps), machine->smp.cpus, "num-vp", &err);

    object_property_set_bool(OBJECT(&s->cps), true, "realized", &err);



    if (err != NULL) {

hw/mips/mips_malta.c

+2 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,8 @@ static int64_t load_kernel (void) 


static void malta_mips_config(MIPSCPU *cpu)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    unsigned int smp_cpus = ms->smp.cpus;

    CPUMIPSState *env = &cpu->env;

    CPUState *cs = CPU(cpu);

hw/openrisc/openrisc_sim.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static void openrisc_sim_init(MachineState *machine) 
    qemu_irq *cpu_irqs[2];

    qemu_irq serial_irq;

    int n;

    unsigned int smp_cpus = machine->smp.cpus;



    for (n = 0; n < smp_cpus; n++) {

        cpu = OPENRISC_CPU(cpu_create(machine->cpu_type));