OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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
This commit is contained in:
Peter Maydell 2017-07-07 15:42:50 +01:00
parent 1cfe48c1ce
commit b59821a95b
10 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/aspeed.c
View File

@ -216,7 +216,7 @@ static void aspeed_board_init(MachineState *machine,
* SoC and 128MB for the AST2500 SoC, which is twice as big as * SoC and 128MB for the AST2500 SoC, which is twice as big as
* needed by the flash modules of the Aspeed machines. * needed by the flash modules of the Aspeed machines.
*/ */
memory_region_init_rom(boot_rom, OBJECT(bmc), "aspeed.boot_rom", memory_region_init_rom_nomigrate(boot_rom, OBJECT(bmc), "aspeed.boot_rom",
fl->size, &error_abort); fl->size, &error_abort);
memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR, memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR,
boot_rom); boot_rom);

4
hw/arm/fsl-imx25.c
View File

@ -249,7 +249,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
} }
/* initialize 2 x 16 KB ROM */ /* initialize 2 x 16 KB ROM */
memory_region_init_rom(&s->rom[0], NULL, memory_region_init_rom_nomigrate(&s->rom[0], NULL,
"imx25.rom0", FSL_IMX25_ROM0_SIZE, &err); "imx25.rom0", FSL_IMX25_ROM0_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -257,7 +257,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
} }
memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR,
&s->rom[0]); &s->rom[0]);
memory_region_init_rom(&s->rom[1], NULL, memory_region_init_rom_nomigrate(&s->rom[1], NULL,
"imx25.rom1", FSL_IMX25_ROM1_SIZE, &err); "imx25.rom1", FSL_IMX25_ROM1_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);

4
hw/arm/fsl-imx31.c
View File

@ -219,7 +219,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
} }
/* On a real system, the first 16k is a `secure boot rom' */ /* On a real system, the first 16k is a `secure boot rom' */
memory_region_init_rom(&s->secure_rom, NULL, "imx31.secure_rom", memory_region_init_rom_nomigrate(&s->secure_rom, NULL, "imx31.secure_rom",
FSL_IMX31_SECURE_ROM_SIZE, &err); FSL_IMX31_SECURE_ROM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -229,7 +229,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
&s->secure_rom); &s->secure_rom);
/* There is also a 16k ROM */ /* There is also a 16k ROM */
memory_region_init_rom(&s->rom, NULL, "imx31.rom", memory_region_init_rom_nomigrate(&s->rom, NULL, "imx31.rom",
FSL_IMX31_ROM_SIZE, &err); FSL_IMX31_ROM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);

4
hw/arm/fsl-imx6.c
View File

@ -399,7 +399,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
FSL_IMX6_ENET_MAC_1588_IRQ)); FSL_IMX6_ENET_MAC_1588_IRQ));
/* ROM memory */ /* 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); FSL_IMX6_ROM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -409,7 +409,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
&s->rom); &s->rom);
/* CAAM memory */ /* 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); FSL_IMX6_CAAM_MEM_SIZE, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);

2
hw/block/pflash_cfi01.c
View File

@ -743,7 +743,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
return NULL; return NULL;
#endif #endif
memory_region_init_rom_device( memory_region_init_rom_device_nomigrate(
&pfl->mem, OBJECT(dev), &pfl->mem, OBJECT(dev),
&pflash_cfi01_ops, &pflash_cfi01_ops,
pfl, pfl,

2
hw/block/pflash_cfi02.c
View File

@ -621,7 +621,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
return NULL; return NULL;
#endif #endif
memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ? memory_region_init_rom_device_nomigrate(&pfl->orig_mem, OBJECT(pfl), pfl->be ?
&pflash_cfi02_ops_be : &pflash_cfi02_ops_le, &pflash_cfi02_ops_be : &pflash_cfi02_ops_le,
pfl, pfl->name, chip_len, &local_err); pfl, pfl->name, chip_len, &local_err);
if (local_err) { if (local_err) {

2
hw/mips/boston.c
View File

@ -484,7 +484,7 @@ static void boston_mach_init(MachineState *machine)
sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1); sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1);
flash = g_new(MemoryRegion, 1); flash = g_new(MemoryRegion, 1);
memory_region_init_rom_device(flash, NULL, &boston_flash_ops, s, memory_region_init_rom_device_nomigrate(flash, NULL, &boston_flash_ops, s,
"boston.flash", 128 * M_BYTE, &err); "boston.flash", 128 * M_BYTE, &err);
memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0);

2
hw/pci/pci.c
View File

@ -2235,7 +2235,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom,
snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(pdev))); snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(pdev)));
} }
pdev->has_rom = true; pdev->has_rom = true;
memory_region_init_rom(&pdev->rom, OBJECT(pdev), name, size, &error_fatal); memory_region_init_rom_nomigrate(&pdev->rom, OBJECT(pdev), name, size, &error_fatal);
vmstate_register_ram(&pdev->rom, &pdev->qdev); vmstate_register_ram(&pdev->rom, &pdev->qdev);
ptr = memory_region_get_ram_ptr(&pdev->rom); ptr = memory_region_get_ram_ptr(&pdev->rom);
load_image(path, ptr); load_image(path, ptr);

40
include/exec/memory.h
View File

@ -586,12 +586,16 @@ void memory_region_init_alias(MemoryRegion *mr,
uint64_t size); uint64_t size);
/** /**
* memory_region_init_rom: Initialize a ROM memory region. * memory_region_init_rom_nomigrate: Initialize a ROM memory region.
* *
* This has the same effect as calling memory_region_init_ram() * This has the same effect as calling memory_region_init_ram_nomigrate()
* and then marking the resulting region read-only with * and then marking the resulting region read-only with
* memory_region_set_readonly(). * memory_region_set_readonly().
* *
* Note that this function does not do anything to cause the data in the
* RAM side of the memory region to be migrated; that is the responsibility
* of the caller.
*
* @mr: the #MemoryRegion to be initialized. * @mr: the #MemoryRegion to be initialized.
* @owner: the object that tracks the region's reference count * @owner: the object that tracks the region's reference count
* @name: Region name, becomes part of RAMBlock name used in migration stream * @name: Region name, becomes part of RAMBlock name used in migration stream
@ -599,15 +603,19 @@ void memory_region_init_alias(MemoryRegion *mr,
* @size: size of the region. * @size: size of the region.
* @errp: pointer to Error*, to store an error if it happens. * @errp: pointer to Error*, to store an error if it happens.
*/ */
void memory_region_init_rom(MemoryRegion *mr, void memory_region_init_rom_nomigrate(MemoryRegion *mr,
struct Object *owner, struct Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,
Error **errp); Error **errp);
/** /**
* memory_region_init_rom_device: Initialize a ROM memory region. Writes are * memory_region_init_rom_device_nomigrate: Initialize a ROM memory region.
* handled via callbacks. * Writes are handled via callbacks.
*
* Note that this function does not do anything to cause the data in the
* RAM side of the memory region to be migrated; that is the responsibility
* of the caller.
* *
* @mr: the #MemoryRegion to be initialized. * @mr: the #MemoryRegion to be initialized.
* @owner: the object that tracks the region's reference count * @owner: the object that tracks the region's reference count
@ -617,13 +625,13 @@ void memory_region_init_rom(MemoryRegion *mr,
* @size: size of the region. * @size: size of the region.
* @errp: pointer to Error*, to store an error if it happens. * @errp: pointer to Error*, to store an error if it happens.
*/ */
void memory_region_init_rom_device(MemoryRegion *mr, void memory_region_init_rom_device_nomigrate(MemoryRegion *mr,
struct Object *owner, struct Object *owner,
const MemoryRegionOps *ops, const MemoryRegionOps *ops,
void *opaque, void *opaque,
const char *name, const char *name,
uint64_t size, uint64_t size,
Error **errp); Error **errp);
/** /**
* memory_region_init_reservation: Initialize a memory region that reserves * memory_region_init_reservation: Initialize a memory region that reserves

24
memory.c
View File

@ -1473,11 +1473,11 @@ void memory_region_init_alias(MemoryRegion *mr,
mr->alias_offset = offset; mr->alias_offset = offset;
} }
void memory_region_init_rom(MemoryRegion *mr, void memory_region_init_rom_nomigrate(MemoryRegion *mr,
struct Object *owner, struct Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,
Error **errp) Error **errp)
{ {
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ram = true; mr->ram = true;
@ -1488,13 +1488,13 @@ void memory_region_init_rom(MemoryRegion *mr,
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
void memory_region_init_rom_device(MemoryRegion *mr, void memory_region_init_rom_device_nomigrate(MemoryRegion *mr,
Object *owner, Object *owner,
const MemoryRegionOps *ops, const MemoryRegionOps *ops,
void *opaque, void *opaque,
const char *name, const char *name,
uint64_t size, uint64_t size,
Error **errp) Error **errp)
{ {
assert(ops); assert(ops);
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);