david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aspeed: use {set, get}_uint() for "ram-size" property

Browse Source 
This property is an alias for device TYPE_ASPEED_SDMC's property
"ram-size", which is defined with DEFINE_PROP_UINT64().

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170607163635.17635-25-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-06-07 20:36:16 +04:00 committed by Markus Armbruster
parent c03d83d55a
commit 19e9cdf040
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/aspeed.c
View File

@ -180,8 +180,8 @@ static void aspeed_board_init(MachineState *machine,
sc = ASPEED_SOC_GET_CLASS(&bmc->soc); sc = ASPEED_SOC_GET_CLASS(&bmc->soc);
object_property_set_int(OBJECT(&bmc->soc), ram_size, "ram-size", object_property_set_uint(OBJECT(&bmc->soc), ram_size, "ram-size",
&error_abort); &error_abort);
object_property_set_int(OBJECT(&bmc->soc), cfg->hw_strap1, "hw-strap1", object_property_set_int(OBJECT(&bmc->soc), cfg->hw_strap1, "hw-strap1",
&error_abort); &error_abort);
object_property_set_int(OBJECT(&bmc->soc), cfg->num_cs, "num-cs", object_property_set_int(OBJECT(&bmc->soc), cfg->num_cs, "num-cs",
@ -193,8 +193,8 @@ static void aspeed_board_init(MachineState *machine,
* Allocate RAM after the memory controller has checked the size * Allocate RAM after the memory controller has checked the size
* was valid. If not, a default value is used. * was valid. If not, a default value is used.
*/ */
ram_size = object_property_get_int(OBJECT(&bmc->soc), "ram-size", ram_size = object_property_get_uint(OBJECT(&bmc->soc), "ram-size",
&error_abort); &error_abort);
memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size); memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size);
memory_region_add_subregion(get_system_memory(), sc->info->sdram_base, memory_region_add_subregion(get_system_memory(), sc->info->sdram_base,