mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
hw/ppc: Replace global smp variables with machine smp properties
The global smp variables in ppc 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 <like.xu@linux.intel.com> Message-Id: <20190518205428.90532-5-like.xu@linux.intel.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
5cc8767d05
commit
fe6b6346e9
7 changed files with 42 additions and 15 deletions
|
@ -688,7 +688,8 @@ static void pnv_init(MachineState *machine)
|
|||
object_property_add_child(OBJECT(pnv), chip_name, chip, &error_fatal);
|
||||
object_property_set_int(chip, PNV_CHIP_HWID(i), "chip-id",
|
||||
&error_fatal);
|
||||
object_property_set_int(chip, smp_cores, "nr-cores", &error_fatal);
|
||||
object_property_set_int(chip, machine->smp.cores,
|
||||
"nr-cores", &error_fatal);
|
||||
object_property_set_bool(chip, true, "realized", &error_fatal);
|
||||
}
|
||||
g_free(chip_typename);
|
||||
|
@ -1149,6 +1150,7 @@ static void pnv_chip_core_sanitize(PnvChip *chip, Error **errp)
|
|||
|
||||
static void pnv_chip_core_realize(PnvChip *chip, Error **errp)
|
||||
{
|
||||
MachineState *ms = MACHINE(qdev_get_machine());
|
||||
Error *error = NULL;
|
||||
PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip);
|
||||
const char *typename = pnv_chip_core_typename(chip);
|
||||
|
@ -1182,7 +1184,7 @@ static void pnv_chip_core_realize(PnvChip *chip, Error **errp)
|
|||
snprintf(core_name, sizeof(core_name), "core[%d]", core_hwid);
|
||||
object_initialize_child(OBJECT(chip), core_name, pnv_core, typesize,
|
||||
typename, &error_fatal, NULL);
|
||||
object_property_set_int(OBJECT(pnv_core), smp_threads, "nr-threads",
|
||||
object_property_set_int(OBJECT(pnv_core), ms->smp.threads, "nr-threads",
|
||||
&error_fatal);
|
||||
object_property_set_int(OBJECT(pnv_core), core_hwid,
|
||||
CPU_CORE_PROP_CORE_ID, &error_fatal);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue