Commit 98a99ce0 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw: Use new memory_region_init_{ram, rom, rom_device}() functions 



Use the new functions memory_region_init_{ram,rom,rom_device}()
instead of manually calling the _nomigrate() version and then
vmstate_register_ram_global().

Patch automatically created using coccinelle script:
 spatch --in-place -sp_file scripts/coccinelle/memory-region-init-ram.cocci -dir hw

(As it turns out, there are no instances of the rom and
rom_device functions that are caught by this script.)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-8-git-send-email-peter.maydell@linaro.org
parent 96d851a6

hw/arm/exynos4210.c

+2 −4
Original line number Diff line number Diff line
@@ -279,9 +279,8 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) 
                                &s->chipid_mem);



    /* Internal ROM */

    memory_region_init_ram_nomigrate(&s->irom_mem, NULL, "exynos4210.irom",

    memory_region_init_ram(&s->irom_mem, NULL, "exynos4210.irom",

                           EXYNOS4210_IROM_SIZE, &error_fatal);

    vmstate_register_ram_global(&s->irom_mem);

    memory_region_set_readonly(&s->irom_mem, true);

    memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR,

                                &s->irom_mem);
@@ -295,9 +294,8 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) 
                                &s->irom_alias_mem);



    /* Internal RAM */

    memory_region_init_ram_nomigrate(&s->iram_mem, NULL, "exynos4210.iram",

    memory_region_init_ram(&s->iram_mem, NULL, "exynos4210.iram",

                           EXYNOS4210_IRAM_SIZE, &error_fatal);

    vmstate_register_ram_global(&s->iram_mem);

    memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,

                                &s->iram_mem);

hw/arm/exynos4_boards.c

+2 −4
Original line number Diff line number Diff line
@@ -110,18 +110,16 @@ static void exynos4_boards_init_ram(Exynos4BoardState *s, 
    unsigned long mem_size = ram_size;



    if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) {

        memory_region_init_ram_nomigrate(&s->dram1_mem, NULL, "exynos4210.dram1",

        memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1",

                               mem_size - EXYNOS4210_DRAM_MAX_SIZE,

                               &error_fatal);

        vmstate_register_ram_global(&s->dram1_mem);

        memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR,

                                    &s->dram1_mem);

        mem_size = EXYNOS4210_DRAM_MAX_SIZE;

    }



    memory_region_init_ram_nomigrate(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size,

    memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size,

                           &error_fatal);

    vmstate_register_ram_global(&s->dram0_mem);

    memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR,

                                &s->dram0_mem);

}

hw/arm/fsl-imx25.c

+1 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) 
                                &s->rom[1]);



    /* initialize internal RAM (128 KB) */

    memory_region_init_ram_nomigrate(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,

    memory_region_init_ram(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,

                           &err);

    if (err) {

        error_propagate(errp, err);
@@ -275,7 +275,6 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) 
    }

    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ADDR,

                                &s->iram);

    vmstate_register_ram_global(&s->iram);



    /* internal RAM (128 KB) is aliased over 128 MB - 128 KB */

    memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias",

hw/arm/fsl-imx31.c

+1 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) 
                                &s->rom);



    /* initialize internal RAM (16 KB) */

    memory_region_init_ram_nomigrate(&s->iram, NULL, "imx31.iram", FSL_IMX31_IRAM_SIZE,

    memory_region_init_ram(&s->iram, NULL, "imx31.iram", FSL_IMX31_IRAM_SIZE,

                           &err);

    if (err) {

        error_propagate(errp, err);
@@ -247,7 +247,6 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) 
    }

    memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ADDR,

                                &s->iram);

    vmstate_register_ram_global(&s->iram);



    /* internal RAM (16 KB) is aliased over 256 MB - 16 KB */

    memory_region_init_alias(&s->iram_alias, NULL, "imx31.iram_alias",

hw/arm/fsl-imx6.c

+1 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) 
                                &s->caam);



    /* OCRAM memory */

    memory_region_init_ram_nomigrate(&s->ocram, NULL, "imx6.ocram", FSL_IMX6_OCRAM_SIZE,

    memory_region_init_ram(&s->ocram, NULL, "imx6.ocram", FSL_IMX6_OCRAM_SIZE,

                           &err);

    if (err) {

        error_propagate(errp, err);
@@ -427,7 +427,6 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) 
    }

    memory_region_add_subregion(get_system_memory(), FSL_IMX6_OCRAM_ADDR,

                                &s->ocram);

    vmstate_register_ram_global(&s->ocram);



    /* internal OCRAM (256 KB) is aliased over 1 MB */

    memory_region_init_alias(&s->ocram_alias, NULL, "imx6.ocram_alias",