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

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



The global smp variables in arm are replaced with smp machine properties.
The init_cpus() and *_create_rpu() are refactored to pass 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-9-like.xu@linux.intel.com>
[ehabkost: Fix hw/arm/sbsa-ref.c and hw/arm/aspeed.c]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 0e11fc69

hw/arm/aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void aspeed_board_init(MachineState *machine, 
                            &error_abort);

    object_property_set_int(OBJECT(&bmc->soc), cfg->num_cs, "num-cs",

                            &error_abort);

    object_property_set_int(OBJECT(&bmc->soc), smp_cpus, "num-cpus",

    object_property_set_int(OBJECT(&bmc->soc), machine->smp.cpus, "num-cpus",

                            &error_abort);

    if (machine->kernel_filename) {

        /*

hw/arm/fsl-imx6.c

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/arm/fsl-imx6.h"

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "chardev/char.h"

#include "qemu/error-report.h"
@@ -33,11 +34,12 @@ 


static void fsl_imx6_init(Object *obj)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    FslIMX6State *s = FSL_IMX6(obj);

    char name[NAME_SIZE];

    int i;



    for (i = 0; i < MIN(smp_cpus, FSL_IMX6_NUM_CPUS); i++) {

    for (i = 0; i < MIN(ms->smp.cpus, FSL_IMX6_NUM_CPUS); i++) {

        snprintf(name, NAME_SIZE, "cpu%d", i);

        object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]),

                                "cortex-a9-" TYPE_ARM_CPU, &error_abort, NULL);
@@ -93,9 +95,11 @@ static void fsl_imx6_init(Object *obj) 


static void fsl_imx6_realize(DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    FslIMX6State *s = FSL_IMX6(dev);

    uint16_t i;

    Error *err = NULL;

    unsigned int smp_cpus = ms->smp.cpus;



    if (smp_cpus > FSL_IMX6_NUM_CPUS) {

        error_setg(errp, "%s: Only %d CPUs are supported (%d requested)",

hw/arm/fsl-imx6ul.c

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "qapi/error.h"

#include "hw/arm/fsl-imx6ul.h"

#include "hw/misc/unimp.h"

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "qemu/error-report.h"

#include "qemu/module.h"
@@ -28,11 +29,12 @@ 


static void fsl_imx6ul_init(Object *obj)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    FslIMX6ULState *s = FSL_IMX6UL(obj);

    char name[NAME_SIZE];

    int i;



    for (i = 0; i < MIN(smp_cpus, FSL_IMX6UL_NUM_CPUS); i++) {

    for (i = 0; i < MIN(ms->smp.cpus, FSL_IMX6UL_NUM_CPUS); i++) {

        snprintf(name, NAME_SIZE, "cpu%d", i);

        object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]),

                                "cortex-a7-" TYPE_ARM_CPU, &error_abort, NULL);
@@ -156,10 +158,12 @@ static void fsl_imx6ul_init(Object *obj) 


static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    FslIMX6ULState *s = FSL_IMX6UL(dev);

    int i;

    qemu_irq irq;

    char name[NAME_SIZE];

    unsigned int smp_cpus = ms->smp.cpus;



    if (smp_cpus > FSL_IMX6UL_NUM_CPUS) {

        error_setg(errp, "%s: Only %d CPUs are supported (%d requested)",

hw/arm/fsl-imx7.c

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qapi/error.h"

#include "hw/arm/fsl-imx7.h"

#include "hw/misc/unimp.h"

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "qemu/error-report.h"

#include "qemu/module.h"
@@ -30,12 +31,12 @@ 


static void fsl_imx7_init(Object *obj)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    FslIMX7State *s = FSL_IMX7(obj);

    char name[NAME_SIZE];

    int i;





    for (i = 0; i < MIN(smp_cpus, FSL_IMX7_NUM_CPUS); i++) {

    for (i = 0; i < MIN(ms->smp.cpus, FSL_IMX7_NUM_CPUS); i++) {

        snprintf(name, NAME_SIZE, "cpu%d", i);

        object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]),

                                ARM_CPU_TYPE_NAME("cortex-a7"), &error_abort,
@@ -155,11 +156,13 @@ static void fsl_imx7_init(Object *obj) 


static void fsl_imx7_realize(DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    FslIMX7State *s = FSL_IMX7(dev);

    Object *o;

    int i;

    qemu_irq irq;

    char name[NAME_SIZE];

    unsigned int smp_cpus = ms->smp.cpus;



    if (smp_cpus > FSL_IMX7_NUM_CPUS) {

        error_setg(errp, "%s: Only %d CPUs are supported (%d requested)",

hw/arm/highbank.c

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    SysBusDevice *busdev;

    qemu_irq pic[128];

    int n;

    unsigned int smp_cpus = machine->smp.cpus;

    qemu_irq cpu_irq[4];

    qemu_irq cpu_fiq[4];

    qemu_irq cpu_virq[4];