diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 4a320852..8a9da554 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_aarch64 #define memory_region_set_alias_offset memory_region_set_alias_offset_aarch64 #define memory_region_set_enabled memory_region_set_enabled_aarch64 -#define memory_region_set_global_locking memory_region_set_global_locking_aarch64 #define memory_region_set_readonly memory_region_set_readonly_aarch64 #define memory_region_set_size memory_region_set_size_aarch64 #define memory_region_size memory_region_size_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 11292a6b..4c56c4fe 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_aarch64eb #define memory_region_set_alias_offset memory_region_set_alias_offset_aarch64eb #define memory_region_set_enabled memory_region_set_enabled_aarch64eb -#define memory_region_set_global_locking memory_region_set_global_locking_aarch64eb #define memory_region_set_readonly memory_region_set_readonly_aarch64eb #define memory_region_set_size memory_region_set_size_aarch64eb #define memory_region_size memory_region_size_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 7457dfbb..80a61147 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_arm #define memory_region_set_alias_offset memory_region_set_alias_offset_arm #define memory_region_set_enabled memory_region_set_enabled_arm -#define memory_region_set_global_locking memory_region_set_global_locking_arm #define memory_region_set_readonly memory_region_set_readonly_arm #define memory_region_set_size memory_region_set_size_arm #define memory_region_size memory_region_size_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index 426af4bf..c276ce3d 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_armeb #define memory_region_set_alias_offset memory_region_set_alias_offset_armeb #define memory_region_set_enabled memory_region_set_enabled_armeb -#define memory_region_set_global_locking memory_region_set_global_locking_armeb #define memory_region_set_readonly memory_region_set_readonly_armeb #define memory_region_set_size memory_region_set_size_armeb #define memory_region_size memory_region_size_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 6307cc00..69ed1d06 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2339,7 +2339,6 @@ symbols = ( 'memory_region_set_address', 'memory_region_set_alias_offset', 'memory_region_set_enabled', - 'memory_region_set_global_locking', 'memory_region_set_readonly', 'memory_region_set_size', 'memory_region_size', diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h index 5046df1c..249f4c6b 100644 --- a/qemu/include/exec/memory.h +++ b/qemu/include/exec/memory.h @@ -726,18 +726,6 @@ bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr, */ void memory_region_set_readonly(MemoryRegion *mr, bool readonly); -/** - * memory_region_set_global_locking: Declares the access processing requires - * QEMU's global lock. - * - * When this is invoked, accesses to the memory region will be processed while - * holding the global lock of QEMU. This is the default behavior of memory - * regions. - * - * @mr: the memory region to be updated. - */ -void memory_region_set_global_locking(MemoryRegion *mr); - /** * memory_region_clear_global_locking: Declares that access processing does * not depend on the QEMU global lock. diff --git a/qemu/m68k.h b/qemu/m68k.h index 861eab4d..11e25593 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_m68k #define memory_region_set_alias_offset memory_region_set_alias_offset_m68k #define memory_region_set_enabled memory_region_set_enabled_m68k -#define memory_region_set_global_locking memory_region_set_global_locking_m68k #define memory_region_set_readonly memory_region_set_readonly_m68k #define memory_region_set_size memory_region_set_size_m68k #define memory_region_size memory_region_size_m68k diff --git a/qemu/memory.c b/qemu/memory.c index 94669f96..ee3d8b97 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -1412,11 +1412,6 @@ void memory_region_set_readonly(MemoryRegion *mr, bool readonly) } } -void memory_region_set_global_locking(MemoryRegion *mr) -{ - mr->global_locking = true; -} - void memory_region_clear_global_locking(MemoryRegion *mr) { mr->global_locking = false; diff --git a/qemu/mips.h b/qemu/mips.h index 455558bc..8451f47e 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_mips #define memory_region_set_alias_offset memory_region_set_alias_offset_mips #define memory_region_set_enabled memory_region_set_enabled_mips -#define memory_region_set_global_locking memory_region_set_global_locking_mips #define memory_region_set_readonly memory_region_set_readonly_mips #define memory_region_set_size memory_region_set_size_mips #define memory_region_size memory_region_size_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index 4c48e862..11b8a70e 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_mips64 #define memory_region_set_alias_offset memory_region_set_alias_offset_mips64 #define memory_region_set_enabled memory_region_set_enabled_mips64 -#define memory_region_set_global_locking memory_region_set_global_locking_mips64 #define memory_region_set_readonly memory_region_set_readonly_mips64 #define memory_region_set_size memory_region_set_size_mips64 #define memory_region_size memory_region_size_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index 5e515a28..3e4fac4b 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_mips64el #define memory_region_set_alias_offset memory_region_set_alias_offset_mips64el #define memory_region_set_enabled memory_region_set_enabled_mips64el -#define memory_region_set_global_locking memory_region_set_global_locking_mips64el #define memory_region_set_readonly memory_region_set_readonly_mips64el #define memory_region_set_size memory_region_set_size_mips64el #define memory_region_size memory_region_size_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index c3803818..0cd6070a 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_mipsel #define memory_region_set_alias_offset memory_region_set_alias_offset_mipsel #define memory_region_set_enabled memory_region_set_enabled_mipsel -#define memory_region_set_global_locking memory_region_set_global_locking_mipsel #define memory_region_set_readonly memory_region_set_readonly_mipsel #define memory_region_set_size memory_region_set_size_mipsel #define memory_region_size memory_region_size_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 74d2ba13..c307a5a0 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_powerpc #define memory_region_set_alias_offset memory_region_set_alias_offset_powerpc #define memory_region_set_enabled memory_region_set_enabled_powerpc -#define memory_region_set_global_locking memory_region_set_global_locking_powerpc #define memory_region_set_readonly memory_region_set_readonly_powerpc #define memory_region_set_size memory_region_set_size_powerpc #define memory_region_size memory_region_size_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index 01b358f7..ee3f6409 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_sparc #define memory_region_set_alias_offset memory_region_set_alias_offset_sparc #define memory_region_set_enabled memory_region_set_enabled_sparc -#define memory_region_set_global_locking memory_region_set_global_locking_sparc #define memory_region_set_readonly memory_region_set_readonly_sparc #define memory_region_set_size memory_region_set_size_sparc #define memory_region_size memory_region_size_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index 613d1329..e8f48300 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_sparc64 #define memory_region_set_alias_offset memory_region_set_alias_offset_sparc64 #define memory_region_set_enabled memory_region_set_enabled_sparc64 -#define memory_region_set_global_locking memory_region_set_global_locking_sparc64 #define memory_region_set_readonly memory_region_set_readonly_sparc64 #define memory_region_set_size memory_region_set_size_sparc64 #define memory_region_size memory_region_size_sparc64 diff --git a/qemu/x86_64.h b/qemu/x86_64.h index ee08e59d..9743bb32 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2333,7 +2333,6 @@ #define memory_region_set_address memory_region_set_address_x86_64 #define memory_region_set_alias_offset memory_region_set_alias_offset_x86_64 #define memory_region_set_enabled memory_region_set_enabled_x86_64 -#define memory_region_set_global_locking memory_region_set_global_locking_x86_64 #define memory_region_set_readonly memory_region_set_readonly_x86_64 #define memory_region_set_size memory_region_set_size_x86_64 #define memory_region_size memory_region_size_x86_64