Commit 1cfe48c1 authored by Peter Maydell's avatar Peter Maydell
Browse files

memory: Rename memory_region_init_ram() to memory_region_init_ram_nomigrate() 



Rename memory_region_init_ram() to memory_region_init_ram_nomigrate().
This leaves the way clear for us to provide a memory_region_init_ram()
which does handle migration.

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

backends/hostmem-ram.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
    }



    path = object_get_canonical_path_component(OBJECT(backend));

    memory_region_init_ram(&backend->mr, OBJECT(backend), path,

    memory_region_init_ram_nomigrate(&backend->mr, OBJECT(backend), path,

                           backend->size, errp);

    g_free(path);

}

hw/arm/aspeed_soc.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
    }



    /* SRAM */

    memory_region_init_ram(&s->sram, OBJECT(dev), "aspeed.sram",

    memory_region_init_ram_nomigrate(&s->sram, OBJECT(dev), "aspeed.sram",

                           sc->info->sram_size, &err);

    if (err) {

        error_propagate(errp, err);

hw/arm/exynos4210.c

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



    /* Internal ROM */

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

    memory_region_init_ram_nomigrate(&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);
@@ -295,7 +295,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) 
                                &s->irom_alias_mem);



    /* Internal RAM */

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

    memory_region_init_ram_nomigrate(&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,

hw/arm/exynos4_boards.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 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(&s->dram1_mem, NULL, "exynos4210.dram1",

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

                               mem_size - EXYNOS4210_DRAM_MAX_SIZE,

                               &error_fatal);

        vmstate_register_ram_global(&s->dram1_mem);
@@ -119,7 +119,7 @@ static void exynos4_boards_init_ram(Exynos4BoardState *s, 
        mem_size = EXYNOS4210_DRAM_MAX_SIZE;

    }



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

    memory_region_init_ram_nomigrate(&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,

hw/arm/fsl-imx25.c

+1 −1
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(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,

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

                           &err);

    if (err) {

        error_propagate(errp, err);