diff options
| author | Peter Maydell | 2017-07-07 16:42:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-14 18:59:42 +0200 |
| commit | b59821a95bd1d7cb4697fd7748725c910582e0e7 (patch) | |
| tree | df1bfc288a92bbd2f2bbcdb588241be9cd87e8ef /hw/arm/fsl-imx6.c | |
| parent | memory: Rename memory_region_init_ram() to memory_region_init_ram_nomigrate() (diff) | |
| download | qemu-b59821a95bd1d7cb4697fd7748725c910582e0e7.tar.gz qemu-b59821a95bd1d7cb4697fd7748725c910582e0e7.tar.xz qemu-b59821a95bd1d7cb4697fd7748725c910582e0e7.zip | |
memory: Rename memory_region_init_rom() and _rom_device() to _nomigrate()
Rename memory_region_init_rom() to memory_region_init_rom_nomigrate()
and memory_region_init_rom_device() to
memory_region_init_rom_device_nomigrate().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-5-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/fsl-imx6.c')
| -rw-r--r-- | hw/arm/fsl-imx6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 7234950a40..e00b2f9f10 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -399,7 +399,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) FSL_IMX6_ENET_MAC_1588_IRQ)); /* ROM memory */ - memory_region_init_rom(&s->rom, NULL, "imx6.rom", + memory_region_init_rom_nomigrate(&s->rom, NULL, "imx6.rom", FSL_IMX6_ROM_SIZE, &err); if (err) { error_propagate(errp, err); @@ -409,7 +409,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) &s->rom); /* CAAM memory */ - memory_region_init_rom(&s->caam, NULL, "imx6.caam", + memory_region_init_rom_nomigrate(&s->caam, NULL, "imx6.caam", FSL_IMX6_CAAM_MEM_SIZE, &err); if (err) { error_propagate(errp, err); |