Message ID | 20191020225650.3671-7-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw: Let the machine be the owner of the system memory | expand |
On 10/20/19 3:56 PM, Philippe Mathieu-Daudé wrote: > Having the RAM creation code in a separate function is not > very helpful. Move this code directly inside the board_init() > function, this will later allow the board to have the QOM > ownership of the RAM. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/arm/digic_boards.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Sun, Oct 20, 2019 at 4:07 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Having the RAM creation code in a separate function is not > very helpful. Move this code directly inside the board_init() > function, this will later allow the board to have the QOM > ownership of the RAM. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/arm/digic_boards.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c > index 304e4d1a29..ef3fc2b6a5 100644 > --- a/hw/arm/digic_boards.c > +++ b/hw/arm/digic_boards.c > @@ -53,12 +53,6 @@ typedef struct DigicBoard { > const char *rom1_def_filename; > } DigicBoard; > > -static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) > -{ > - memory_region_allocate_system_memory(&s->ram, NULL, "ram", ram_size); > - memory_region_add_subregion(get_system_memory(), 0, &s->ram); > -} > - > static void digic4_board_init(DigicBoard *board) > { > Error *err = NULL; > @@ -72,7 +66,8 @@ static void digic4_board_init(DigicBoard *board) > exit(1); > } > > - digic4_board_setup_ram(s, board->ram_size); > + memory_region_allocate_system_memory(&s->ram, NULL, "ram", board->ram_size); > + memory_region_add_subregion(get_system_memory(), 0, &s->ram); > > if (board->add_rom0) { > board->add_rom0(s, DIGIC4_ROM0_BASE, board->rom0_def_filename); > -- > 2.21.0 > >
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 304e4d1a29..ef3fc2b6a5 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -53,12 +53,6 @@ typedef struct DigicBoard { const char *rom1_def_filename; } DigicBoard; -static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) -{ - memory_region_allocate_system_memory(&s->ram, NULL, "ram", ram_size); - memory_region_add_subregion(get_system_memory(), 0, &s->ram); -} - static void digic4_board_init(DigicBoard *board) { Error *err = NULL; @@ -72,7 +66,8 @@ static void digic4_board_init(DigicBoard *board) exit(1); } - digic4_board_setup_ram(s, board->ram_size); + memory_region_allocate_system_memory(&s->ram, NULL, "ram", board->ram_size); + memory_region_add_subregion(get_system_memory(), 0, &s->ram); if (board->add_rom0) { board->add_rom0(s, DIGIC4_ROM0_BASE, board->rom0_def_filename);
Having the RAM creation code in a separate function is not very helpful. Move this code directly inside the board_init() function, this will later allow the board to have the QOM ownership of the RAM. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/arm/digic_boards.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)