diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 0691d8b7..3bc68635 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_aarch64 #define memory_region_init_reservation memory_region_init_reservation_aarch64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64 -#define memory_region_init_rom memory_region_init_rom_aarch64 +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_aarch64 #define memory_region_initfn memory_region_initfn_aarch64 #define memory_region_is_logging memory_region_is_logging_aarch64 #define memory_region_is_mapped memory_region_is_mapped_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 821e4ab6..f4cbc635 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_aarch64eb #define memory_region_init_reservation memory_region_init_reservation_aarch64eb #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64eb -#define memory_region_init_rom memory_region_init_rom_aarch64eb +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_aarch64eb #define memory_region_initfn memory_region_initfn_aarch64eb #define memory_region_is_logging memory_region_is_logging_aarch64eb #define memory_region_is_mapped memory_region_is_mapped_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 7c971152..96f680b4 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_arm #define memory_region_init_reservation memory_region_init_reservation_arm #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_arm -#define memory_region_init_rom memory_region_init_rom_arm +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_arm #define memory_region_initfn memory_region_initfn_arm #define memory_region_is_logging memory_region_is_logging_arm #define memory_region_is_mapped memory_region_is_mapped_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index a54f623e..0948c2df 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_armeb #define memory_region_init_reservation memory_region_init_reservation_armeb #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_armeb -#define memory_region_init_rom memory_region_init_rom_armeb +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_armeb #define memory_region_initfn memory_region_initfn_armeb #define memory_region_is_logging memory_region_is_logging_armeb #define memory_region_is_mapped memory_region_is_mapped_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index f760c90b..8e983b89 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2314,7 +2314,7 @@ symbols = ( 'memory_region_init_ram_ptr', 'memory_region_init_reservation', 'memory_region_init_resizeable_ram', - 'memory_region_init_rom', + 'memory_region_init_rom_nomigrate', 'memory_region_initfn', 'memory_region_is_logging', 'memory_region_is_mapped', diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h index 08fdbeca..c416fd4a 100644 --- a/qemu/include/exec/memory.h +++ b/qemu/include/exec/memory.h @@ -440,12 +440,16 @@ void memory_region_init_alias(struct uc_struct *uc, 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 * 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. * @owner: the object that tracks the region's reference count * @name: Region name, becomes part of RAMBlock name used in migration stream @@ -453,16 +457,20 @@ void memory_region_init_alias(struct uc_struct *uc, * @size: size of the region. * @errp: pointer to Error*, to store an error if it happens. */ -void memory_region_init_rom(struct uc_struct *uc, - MemoryRegion *mr, - struct Object *owner, - const char *name, - uint64_t size, - Error **errp); +void memory_region_init_rom_nomigrate(struct uc_struct *uc, + MemoryRegion *mr, + struct Object *owner, + const char *name, + uint64_t size, + Error **errp); /** - * memory_region_init_rom_device: Initialize a ROM memory region. Writes are - * handled via callbacks. + * memory_region_init_rom_device_nomigrate: Initialize a ROM memory region. + * 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. * @owner: the object that tracks the region's reference count @@ -472,14 +480,14 @@ void memory_region_init_rom(struct uc_struct *uc, * @size: size of the region. * @errp: pointer to Error*, to store an error if it happens. */ -void memory_region_init_rom_device(struct uc_struct *uc, - MemoryRegion *mr, - struct Object *owner, - const MemoryRegionOps *ops, - void *opaque, - const char *name, - uint64_t size, - Error **errp); +void memory_region_init_rom_device_nomigrate(struct uc_struct *uc, + MemoryRegion *mr, + struct Object *owner, + const MemoryRegionOps *ops, + void *opaque, + const char *name, + uint64_t size, + Error **errp); /** * memory_region_init_resizeable_ram: Initialize memory region with resizeable diff --git a/qemu/m68k.h b/qemu/m68k.h index 66c12796..bae562b9 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_m68k #define memory_region_init_reservation memory_region_init_reservation_m68k #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_m68k -#define memory_region_init_rom memory_region_init_rom_m68k +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_m68k #define memory_region_initfn memory_region_initfn_m68k #define memory_region_is_logging memory_region_is_logging_m68k #define memory_region_is_mapped memory_region_is_mapped_m68k diff --git a/qemu/memory.c b/qemu/memory.c index 4055ab5b..f7d13719 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -1262,12 +1262,12 @@ void memory_region_init_resizeable_ram(struct uc_struct *uc, mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0; } -void memory_region_init_rom(struct uc_struct *uc, - MemoryRegion *mr, - struct Object *owner, - const char *name, - uint64_t size, - Error **errp) +void memory_region_init_rom_nomigrate(struct uc_struct *uc, + MemoryRegion *mr, + struct Object *owner, + const char *name, + uint64_t size, + Error **errp) { memory_region_init(uc, mr, owner, name, size); mr->ram = true; diff --git a/qemu/mips.h b/qemu/mips.h index 3f72ef2a..80c7f356 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips #define memory_region_init_reservation memory_region_init_reservation_mips #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips -#define memory_region_init_rom memory_region_init_rom_mips +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_mips #define memory_region_initfn memory_region_initfn_mips #define memory_region_is_logging memory_region_is_logging_mips #define memory_region_is_mapped memory_region_is_mapped_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index f9a15cdb..247d68fc 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips64 #define memory_region_init_reservation memory_region_init_reservation_mips64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64 -#define memory_region_init_rom memory_region_init_rom_mips64 +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_mips64 #define memory_region_initfn memory_region_initfn_mips64 #define memory_region_is_logging memory_region_is_logging_mips64 #define memory_region_is_mapped memory_region_is_mapped_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index 14d59353..1a7f1666 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips64el #define memory_region_init_reservation memory_region_init_reservation_mips64el #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64el -#define memory_region_init_rom memory_region_init_rom_mips64el +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_mips64el #define memory_region_initfn memory_region_initfn_mips64el #define memory_region_is_logging memory_region_is_logging_mips64el #define memory_region_is_mapped memory_region_is_mapped_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index 2aeb1870..06f96674 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mipsel #define memory_region_init_reservation memory_region_init_reservation_mipsel #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mipsel -#define memory_region_init_rom memory_region_init_rom_mipsel +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_mipsel #define memory_region_initfn memory_region_initfn_mipsel #define memory_region_is_logging memory_region_is_logging_mipsel #define memory_region_is_mapped memory_region_is_mapped_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 20b9ea78..f5bd581e 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_powerpc #define memory_region_init_reservation memory_region_init_reservation_powerpc #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_powerpc -#define memory_region_init_rom memory_region_init_rom_powerpc +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_powerpc #define memory_region_initfn memory_region_initfn_powerpc #define memory_region_is_logging memory_region_is_logging_powerpc #define memory_region_is_mapped memory_region_is_mapped_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index 10d01083..2fe7e1b9 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_sparc #define memory_region_init_reservation memory_region_init_reservation_sparc #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc -#define memory_region_init_rom memory_region_init_rom_sparc +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_sparc #define memory_region_initfn memory_region_initfn_sparc #define memory_region_is_logging memory_region_is_logging_sparc #define memory_region_is_mapped memory_region_is_mapped_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index 55c418bc..c44cad23 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_sparc64 #define memory_region_init_reservation memory_region_init_reservation_sparc64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc64 -#define memory_region_init_rom memory_region_init_rom_sparc64 +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_sparc64 #define memory_region_initfn memory_region_initfn_sparc64 #define memory_region_is_logging memory_region_is_logging_sparc64 #define memory_region_is_mapped memory_region_is_mapped_sparc64 diff --git a/qemu/x86_64.h b/qemu/x86_64.h index 86e77c7e..09255c9e 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2308,7 +2308,7 @@ #define memory_region_init_ram_ptr memory_region_init_ram_ptr_x86_64 #define memory_region_init_reservation memory_region_init_reservation_x86_64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_x86_64 -#define memory_region_init_rom memory_region_init_rom_x86_64 +#define memory_region_init_rom_nomigrate memory_region_init_rom_nomigrate_x86_64 #define memory_region_initfn memory_region_initfn_x86_64 #define memory_region_is_logging memory_region_is_logging_x86_64 #define memory_region_is_mapped memory_region_is_mapped_x86_64