ppc: rs6000_mc: drop usage of memory_region_allocate_system_memory()
rs6000mc_realize() violates memory_region_allocate_system_memory() contract by calling it multiple times which could break -mem-path. Replace it with plain memory_region_init_ram() instead. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20191008113318.7012-3-imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
6966631c3e
commit
2def24f159
|
@ -144,6 +144,7 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp)
|
||||||
RS6000MCState *s = RS6000MC_DEVICE(dev);
|
RS6000MCState *s = RS6000MC_DEVICE(dev);
|
||||||
int socket = 0;
|
int socket = 0;
|
||||||
unsigned int ram_size = s->ram_size / MiB;
|
unsigned int ram_size = s->ram_size / MiB;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
while (socket < 6) {
|
while (socket < 6) {
|
||||||
if (ram_size >= 64) {
|
if (ram_size >= 64) {
|
||||||
|
@ -165,19 +166,21 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp)
|
||||||
if (s->simm_size[socket]) {
|
if (s->simm_size[socket]) {
|
||||||
char name[] = "simm.?";
|
char name[] = "simm.?";
|
||||||
name[5] = socket + '0';
|
name[5] = socket + '0';
|
||||||
memory_region_allocate_system_memory(&s->simm[socket], OBJECT(dev),
|
memory_region_init_ram(&s->simm[socket], OBJECT(dev), name,
|
||||||
name,
|
s->simm_size[socket] * MiB, &local_err);
|
||||||
s->simm_size[socket] * MiB);
|
if (local_err) {
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
memory_region_add_subregion_overlap(get_system_memory(), 0,
|
memory_region_add_subregion_overlap(get_system_memory(), 0,
|
||||||
&s->simm[socket], socket);
|
&s->simm[socket], socket);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ram_size) {
|
if (ram_size) {
|
||||||
/* unable to push all requested RAM in SIMMs */
|
/* unable to push all requested RAM in SIMMs */
|
||||||
error_setg(errp, "RAM size incompatible with this board. "
|
error_setg(&local_err, "RAM size incompatible with this board. "
|
||||||
"Try again with something else, like %" PRId64 " MB",
|
"Try again with something else, like %" PRId64 " MB",
|
||||||
s->ram_size / MiB - ram_size);
|
s->ram_size / MiB - ram_size);
|
||||||
return;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->autoconfigure) {
|
if (s->autoconfigure) {
|
||||||
|
@ -193,6 +196,8 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp)
|
||||||
|
|
||||||
isa_register_portio_list(ISA_DEVICE(dev), &s->portio, 0x0,
|
isa_register_portio_list(ISA_DEVICE(dev), &s->portio, 0x0,
|
||||||
rs6000mc_port_list, s, "rs6000mc");
|
rs6000mc_port_list, s, "rs6000mc");
|
||||||
|
out:
|
||||||
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const VMStateDescription vmstate_rs6000mc = {
|
static const VMStateDescription vmstate_rs6000mc = {
|
||||||
|
|
Loading…
Reference in New Issue