yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-17 23:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Rename memory_region_init_rom() and _rom_device() to _nomigrate()

Browse source 
Rename memory_region_init_rom() to memory_region_init_rom_nomigrate()
and memory_region_init_rom_device() to
memory_region_init_rom_device_nomigrate().

Backports commit b59821a95bd1d7cb4697fd7748725c910582e0e7 from qemu
This commit is contained in:
Peter Maydell 2018-03-03 22:28:41 -05:00 committed by Lioncash
parent 7b0027a828
commit 3bd5694a0a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
16 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/aarch64.h
View file

@ -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

2
qemu/aarch64eb.h
View file

@ -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

2
qemu/arm.h
View file

@ -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

2
qemu/armeb.h
View file

@ -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

2
qemu/header_gen.py
View file

@ -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',

44
qemu/include/exec/memory.h
View file

@ -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

2
qemu/m68k.h
View file

@ -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

12
qemu/memory.c
View file

@ -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;

2
qemu/mips.h
View file

@ -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

2
qemu/mips64.h
View file

@ -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

2
qemu/mips64el.h
View file

@ -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

2
qemu/mipsel.h
View file

@ -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

2
qemu/powerpc.h
View file

@ -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

2
qemu/sparc.h
View file

@ -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

2
qemu/sparc64.h
View file

@ -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

2
qemu/x86_64.h
View file

@ -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