diff --git a/qemu/aarch64.h b/qemu/aarch64.h index c579b48d..f863b035 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_aarch64 #define qemu_ram_foreach_block qemu_ram_foreach_block_aarch64 #define qemu_ram_free qemu_ram_free_aarch64 -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_aarch64 #define qemu_ram_get_idstr qemu_ram_get_idstr_aarch64 #define qemu_ram_ptr_length qemu_ram_ptr_length_aarch64 #define qemu_ram_remap qemu_ram_remap_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 34723ab0..ecb2f459 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_aarch64eb #define qemu_ram_foreach_block qemu_ram_foreach_block_aarch64eb #define qemu_ram_free qemu_ram_free_aarch64eb -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_aarch64eb #define qemu_ram_get_idstr qemu_ram_get_idstr_aarch64eb #define qemu_ram_ptr_length qemu_ram_ptr_length_aarch64eb #define qemu_ram_remap qemu_ram_remap_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 3456887b..7e3f3024 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_arm #define qemu_ram_foreach_block qemu_ram_foreach_block_arm #define qemu_ram_free qemu_ram_free_arm -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_arm #define qemu_ram_get_idstr qemu_ram_get_idstr_arm #define qemu_ram_ptr_length qemu_ram_ptr_length_arm #define qemu_ram_remap qemu_ram_remap_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index b7ae2e02..bc8016bf 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_armeb #define qemu_ram_foreach_block qemu_ram_foreach_block_armeb #define qemu_ram_free qemu_ram_free_armeb -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_armeb #define qemu_ram_get_idstr qemu_ram_get_idstr_armeb #define qemu_ram_ptr_length qemu_ram_ptr_length_armeb #define qemu_ram_remap qemu_ram_remap_armeb diff --git a/qemu/exec.c b/qemu/exec.c index c770e600..5ac84130 100644 --- a/qemu/exec.c +++ b/qemu/exec.c @@ -1169,21 +1169,6 @@ ram_addr_t qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz, return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true, mr, errp); } -void qemu_ram_free_from_ptr(struct uc_struct *uc, ram_addr_t addr) -{ - RAMBlock *block; - - QTAILQ_FOREACH(block, &uc->ram_list.blocks, next) { - if (addr == block->offset) { - QTAILQ_REMOVE(&uc->ram_list.blocks, block, next); - uc->ram_list.mru_block = NULL; - uc->ram_list.version++; - g_free(block); - break; - } - } -} - void qemu_ram_free(struct uc_struct *uc, ram_addr_t addr) { RAMBlock *block; diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 32f08e6a..d8bce1ac 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2448,7 +2448,6 @@ symbols = ( 'qemu_ram_block_from_host', 'qemu_ram_foreach_block', 'qemu_ram_free', - 'qemu_ram_free_from_ptr', 'qemu_ram_get_idstr', 'qemu_ram_ptr_length', 'qemu_ram_remap', diff --git a/qemu/include/exec/ram_addr.h b/qemu/include/exec/ram_addr.h index 34791d70..164f566d 100644 --- a/qemu/include/exec/ram_addr.h +++ b/qemu/include/exec/ram_addr.h @@ -35,7 +35,6 @@ int qemu_get_ram_fd(struct uc_struct *uc, ram_addr_t addr); void *qemu_get_ram_block_host_ptr(struct uc_struct *uc, ram_addr_t addr); void *qemu_get_ram_ptr(struct uc_struct *uc, ram_addr_t addr); void qemu_ram_free(struct uc_struct *c, ram_addr_t addr); -void qemu_ram_free_from_ptr(struct uc_struct *uc, ram_addr_t addr); int qemu_ram_resize(struct uc_struct *c, ram_addr_t base, ram_addr_t newsize, Error **errp); diff --git a/qemu/m68k.h b/qemu/m68k.h index 5c5f9a9b..9926a2a6 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_m68k #define qemu_ram_foreach_block qemu_ram_foreach_block_m68k #define qemu_ram_free qemu_ram_free_m68k -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_m68k #define qemu_ram_get_idstr qemu_ram_get_idstr_m68k #define qemu_ram_ptr_length qemu_ram_ptr_length_m68k #define qemu_ram_remap qemu_ram_remap_m68k diff --git a/qemu/memory.c b/qemu/memory.c index 6a614798..0b4b7e1c 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -824,7 +824,7 @@ static void memory_region_destructor_alias(MemoryRegion *mr) static void memory_region_destructor_ram_from_ptr(MemoryRegion *mr) { - qemu_ram_free_from_ptr(mr->uc, mr->ram_addr); + qemu_ram_free(mr->uc, mr->ram_addr); } static bool memory_region_need_escape(char c) diff --git a/qemu/mips.h b/qemu/mips.h index 73b312cc..7808743d 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_mips #define qemu_ram_foreach_block qemu_ram_foreach_block_mips #define qemu_ram_free qemu_ram_free_mips -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_mips #define qemu_ram_get_idstr qemu_ram_get_idstr_mips #define qemu_ram_ptr_length qemu_ram_ptr_length_mips #define qemu_ram_remap qemu_ram_remap_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index a497d6a4..71a378c4 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_mips64 #define qemu_ram_foreach_block qemu_ram_foreach_block_mips64 #define qemu_ram_free qemu_ram_free_mips64 -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_mips64 #define qemu_ram_get_idstr qemu_ram_get_idstr_mips64 #define qemu_ram_ptr_length qemu_ram_ptr_length_mips64 #define qemu_ram_remap qemu_ram_remap_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index fdd8f7ef..3e2cab0a 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_mips64el #define qemu_ram_foreach_block qemu_ram_foreach_block_mips64el #define qemu_ram_free qemu_ram_free_mips64el -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_mips64el #define qemu_ram_get_idstr qemu_ram_get_idstr_mips64el #define qemu_ram_ptr_length qemu_ram_ptr_length_mips64el #define qemu_ram_remap qemu_ram_remap_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index f0c4e043..dbb10be6 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_mipsel #define qemu_ram_foreach_block qemu_ram_foreach_block_mipsel #define qemu_ram_free qemu_ram_free_mipsel -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_mipsel #define qemu_ram_get_idstr qemu_ram_get_idstr_mipsel #define qemu_ram_ptr_length qemu_ram_ptr_length_mipsel #define qemu_ram_remap qemu_ram_remap_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 22a423c5..257cf274 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_powerpc #define qemu_ram_foreach_block qemu_ram_foreach_block_powerpc #define qemu_ram_free qemu_ram_free_powerpc -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_powerpc #define qemu_ram_get_idstr qemu_ram_get_idstr_powerpc #define qemu_ram_ptr_length qemu_ram_ptr_length_powerpc #define qemu_ram_remap qemu_ram_remap_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index a29ea395..c5d4c014 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_sparc #define qemu_ram_foreach_block qemu_ram_foreach_block_sparc #define qemu_ram_free qemu_ram_free_sparc -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_sparc #define qemu_ram_get_idstr qemu_ram_get_idstr_sparc #define qemu_ram_ptr_length qemu_ram_ptr_length_sparc #define qemu_ram_remap qemu_ram_remap_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index d9a812c4..2f489182 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_sparc64 #define qemu_ram_foreach_block qemu_ram_foreach_block_sparc64 #define qemu_ram_free qemu_ram_free_sparc64 -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_sparc64 #define qemu_ram_get_idstr qemu_ram_get_idstr_sparc64 #define qemu_ram_ptr_length qemu_ram_ptr_length_sparc64 #define qemu_ram_remap qemu_ram_remap_sparc64 diff --git a/qemu/x86_64.h b/qemu/x86_64.h index 1d13f3dd..81349429 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2442,7 +2442,6 @@ #define qemu_ram_block_from_host qemu_ram_block_from_host_x86_64 #define qemu_ram_foreach_block qemu_ram_foreach_block_x86_64 #define qemu_ram_free qemu_ram_free_x86_64 -#define qemu_ram_free_from_ptr qemu_ram_free_from_ptr_x86_64 #define qemu_ram_get_idstr qemu_ram_get_idstr_x86_64 #define qemu_ram_ptr_length qemu_ram_ptr_length_x86_64 #define qemu_ram_remap qemu_ram_remap_x86_64