yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 09:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Rename memory_region_init_ram() to memory_region_init_ram_nomigrate()

Browse source 
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.

Backports commit 1cfe48c1ce219b60a9096312f7a61806fae64ab3 from qemu
This commit is contained in:
Peter Maydell 2018-03-03 22:23:26 -05:00 committed by Lioncash
parent 152c56f6a9
commit 7b0027a828
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
16 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/aarch64.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_aarch64 #define memory_region_init memory_region_init_aarch64
#define memory_region_init_alias memory_region_init_alias_aarch64 #define memory_region_init_alias memory_region_init_alias_aarch64
#define memory_region_init_io memory_region_init_io_aarch64 #define memory_region_init_io memory_region_init_io_aarch64
#define memory_region_init_ram memory_region_init_ram_aarch64
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_aarch64 #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_aarch64
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_aarch64
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_aarch64 #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_reservation memory_region_init_reservation_aarch64
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64

2
qemu/aarch64eb.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_aarch64eb #define memory_region_init memory_region_init_aarch64eb
#define memory_region_init_alias memory_region_init_alias_aarch64eb #define memory_region_init_alias memory_region_init_alias_aarch64eb
#define memory_region_init_io memory_region_init_io_aarch64eb #define memory_region_init_io memory_region_init_io_aarch64eb
#define memory_region_init_ram memory_region_init_ram_aarch64eb
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_aarch64eb #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_aarch64eb
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_aarch64eb
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_aarch64eb #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_reservation memory_region_init_reservation_aarch64eb
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64eb #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64eb

2
qemu/arm.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_arm #define memory_region_init memory_region_init_arm
#define memory_region_init_alias memory_region_init_alias_arm #define memory_region_init_alias memory_region_init_alias_arm
#define memory_region_init_io memory_region_init_io_arm #define memory_region_init_io memory_region_init_io_arm
#define memory_region_init_ram memory_region_init_ram_arm
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_arm #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_arm
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_arm
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_arm #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_reservation memory_region_init_reservation_arm
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_arm #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_arm

2
qemu/armeb.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_armeb #define memory_region_init memory_region_init_armeb
#define memory_region_init_alias memory_region_init_alias_armeb #define memory_region_init_alias memory_region_init_alias_armeb
#define memory_region_init_io memory_region_init_io_armeb #define memory_region_init_io memory_region_init_io_armeb
#define memory_region_init_ram memory_region_init_ram_armeb
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_armeb #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_armeb
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_armeb
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_armeb #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_reservation memory_region_init_reservation_armeb
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_armeb #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_armeb

2
qemu/header_gen.py
View file

@ -2309,8 +2309,8 @@ symbols = (
'memory_region_init', 'memory_region_init',
'memory_region_init_alias', 'memory_region_init_alias',
'memory_region_init_io', 'memory_region_init_io',
'memory_region_init_ram',
'memory_region_init_ram_device_ptr', 'memory_region_init_ram_device_ptr',
'memory_region_init_ram_nomigrate',
'memory_region_init_ram_ptr', 'memory_region_init_ram_ptr',
'memory_region_init_reservation', 'memory_region_init_reservation',
'memory_region_init_resizeable_ram', 'memory_region_init_resizeable_ram',

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

@ -344,8 +344,9 @@ void memory_region_init_io(struct uc_struct *uc,
uint64_t size); uint64_t size);
/** /**
* memory_region_init_ram: Initialize RAM memory region. Accesses into the * memory_region_init_ram_nomigrate: Initialize RAM memory region. Accesses
* region will modify memory directly. * into the region will modify memory
* directly.
* *
* @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
@ -358,7 +359,7 @@ void memory_region_init_io(struct uc_struct *uc,
* Note that this function does not do anything to cause the data in the * Note that this function does not do anything to cause the data in the
* RAM memory region to be migrated; that is the responsibility of the caller. * RAM memory region to be migrated; that is the responsibility of the caller.
*/ */
void memory_region_init_ram(struct uc_struct *uc, void memory_region_init_ram_nomigrate(struct uc_struct *uc,
MemoryRegion *mr, MemoryRegion *mr,
struct Object *owner, struct Object *owner,
const char *name, const char *name,

2
qemu/m68k.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_m68k #define memory_region_init memory_region_init_m68k
#define memory_region_init_alias memory_region_init_alias_m68k #define memory_region_init_alias memory_region_init_alias_m68k
#define memory_region_init_io memory_region_init_io_m68k #define memory_region_init_io memory_region_init_io_m68k
#define memory_region_init_ram memory_region_init_ram_m68k
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_m68k #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_m68k
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_m68k
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_m68k #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_reservation memory_region_init_reservation_m68k
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_m68k #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_m68k

5
qemu/memory.c
View file

@ -41,7 +41,7 @@ MemoryRegion *memory_map(struct uc_struct *uc, hwaddr begin, size_t size, uint32
{ {
MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram = g_new(MemoryRegion, 1);
memory_region_init_ram(uc, ram, NULL, "pc.ram", size, perms, &error_abort); memory_region_init_ram_nomigrate(uc, ram, NULL, "pc.ram", size, perms, &error_abort);
if (ram->ram_block == NULL) { if (ram->ram_block == NULL) {
// out of memory // out of memory
return NULL; return NULL;
@ -1205,7 +1205,8 @@ void memory_region_init_io(struct uc_struct *uc, MemoryRegion *mr,
mr->terminates = true; mr->terminates = true;
} }
void memory_region_init_ram(struct uc_struct *uc, MemoryRegion *mr, void memory_region_init_ram_nomigrate(struct uc_struct *uc,
MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,

2
qemu/mips.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_mips #define memory_region_init memory_region_init_mips
#define memory_region_init_alias memory_region_init_alias_mips #define memory_region_init_alias memory_region_init_alias_mips
#define memory_region_init_io memory_region_init_io_mips #define memory_region_init_io memory_region_init_io_mips
#define memory_region_init_ram memory_region_init_ram_mips
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_mips
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips #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_reservation memory_region_init_reservation_mips
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips

2
qemu/mips64.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_mips64 #define memory_region_init memory_region_init_mips64
#define memory_region_init_alias memory_region_init_alias_mips64 #define memory_region_init_alias memory_region_init_alias_mips64
#define memory_region_init_io memory_region_init_io_mips64 #define memory_region_init_io memory_region_init_io_mips64
#define memory_region_init_ram memory_region_init_ram_mips64
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips64 #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips64
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_mips64
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips64 #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_reservation memory_region_init_reservation_mips64
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64

2
qemu/mips64el.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_mips64el #define memory_region_init memory_region_init_mips64el
#define memory_region_init_alias memory_region_init_alias_mips64el #define memory_region_init_alias memory_region_init_alias_mips64el
#define memory_region_init_io memory_region_init_io_mips64el #define memory_region_init_io memory_region_init_io_mips64el
#define memory_region_init_ram memory_region_init_ram_mips64el
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips64el #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips64el
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_mips64el
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips64el #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_reservation memory_region_init_reservation_mips64el
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64el #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64el

2
qemu/mipsel.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_mipsel #define memory_region_init memory_region_init_mipsel
#define memory_region_init_alias memory_region_init_alias_mipsel #define memory_region_init_alias memory_region_init_alias_mipsel
#define memory_region_init_io memory_region_init_io_mipsel #define memory_region_init_io memory_region_init_io_mipsel
#define memory_region_init_ram memory_region_init_ram_mipsel
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mipsel #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mipsel
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_mipsel
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_mipsel #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_reservation memory_region_init_reservation_mipsel
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mipsel #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mipsel

2
qemu/powerpc.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_powerpc #define memory_region_init memory_region_init_powerpc
#define memory_region_init_alias memory_region_init_alias_powerpc #define memory_region_init_alias memory_region_init_alias_powerpc
#define memory_region_init_io memory_region_init_io_powerpc #define memory_region_init_io memory_region_init_io_powerpc
#define memory_region_init_ram memory_region_init_ram_powerpc
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_powerpc #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_powerpc
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_powerpc
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_powerpc #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_reservation memory_region_init_reservation_powerpc
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_powerpc #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_powerpc

2
qemu/sparc.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_sparc #define memory_region_init memory_region_init_sparc
#define memory_region_init_alias memory_region_init_alias_sparc #define memory_region_init_alias memory_region_init_alias_sparc
#define memory_region_init_io memory_region_init_io_sparc #define memory_region_init_io memory_region_init_io_sparc
#define memory_region_init_ram memory_region_init_ram_sparc
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_sparc #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_sparc
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_sparc
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_sparc #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_reservation memory_region_init_reservation_sparc
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc

2
qemu/sparc64.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_sparc64 #define memory_region_init memory_region_init_sparc64
#define memory_region_init_alias memory_region_init_alias_sparc64 #define memory_region_init_alias memory_region_init_alias_sparc64
#define memory_region_init_io memory_region_init_io_sparc64 #define memory_region_init_io memory_region_init_io_sparc64
#define memory_region_init_ram memory_region_init_ram_sparc64
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_sparc64 #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_sparc64
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_sparc64
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_sparc64 #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_reservation memory_region_init_reservation_sparc64
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc64

2
qemu/x86_64.h
View file

@ -2303,8 +2303,8 @@
#define memory_region_init memory_region_init_x86_64 #define memory_region_init memory_region_init_x86_64
#define memory_region_init_alias memory_region_init_alias_x86_64 #define memory_region_init_alias memory_region_init_alias_x86_64
#define memory_region_init_io memory_region_init_io_x86_64 #define memory_region_init_io memory_region_init_io_x86_64
#define memory_region_init_ram memory_region_init_ram_x86_64
#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_x86_64 #define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_x86_64
#define memory_region_init_ram_nomigrate memory_region_init_ram_nomigrate_x86_64
#define memory_region_init_ram_ptr memory_region_init_ram_ptr_x86_64 #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_reservation memory_region_init_reservation_x86_64
#define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_x86_64 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_x86_64