From c88064b52ce48823fe8874828cae342cb1c269fe Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 8 Mar 2018 09:02:00 -0500 Subject: [PATCH] memory: remove memory_region_test_and_clear_dirty It is unused after g364fb has been converted to use DirtyBitmapSnapshot. Backports commit 77302fb5df05ffca9f41b5b54e3b67c601719d57 from qemu --- qemu/aarch64.h | 9 ++++++++- qemu/aarch64eb.h | 9 ++++++++- qemu/arm.h | 9 ++++++++- qemu/armeb.h | 9 ++++++++- qemu/header_gen.py | 1 - qemu/include/exec/memory.h | 17 ----------------- qemu/m68k.h | 9 ++++++++- qemu/memory.c | 8 -------- qemu/mips.h | 9 ++++++++- qemu/mips64.h | 9 ++++++++- qemu/mips64el.h | 9 ++++++++- qemu/mipsel.h | 9 ++++++++- qemu/powerpc.h | 9 ++++++++- qemu/sparc.h | 9 ++++++++- qemu/sparc64.h | 9 ++++++++- qemu/x86_64.h | 9 ++++++++- 16 files changed, 104 insertions(+), 39 deletions(-) diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 7aec4caa..b6173f0a 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_aarch64 #define memory_region_to_address_space memory_region_to_address_space_aarch64 #define memory_region_transaction_begin memory_region_transaction_begin_aarch64 #define memory_region_transaction_commit memory_region_transaction_commit_aarch64 @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_aarch64 #define qdict_next qdict_next_aarch64 #define qdict_next_entry qdict_next_entry_aarch64 +#define qdict_put_bool qdict_put_bool_aarch64 +#define qdict_put_int qdict_put_int_aarch64 +#define qdict_put_null qdict_put_null_aarch64 #define qdict_put_obj qdict_put_obj_aarch64 +#define qdict_put_str qdict_put_str_aarch64 #define qdict_size qdict_size_aarch64 #define qdict_type qdict_type_aarch64 #define qemu_clock_get_us qemu_clock_get_us_aarch64 @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_aarch64 #define qint_get_int qint_get_int_aarch64 #define qint_type qint_type_aarch64 +#define qlist_append_bool qlist_append_bool_aarch64 +#define qlist_append_int qlist_append_int_aarch64 +#define qlist_append_null qlist_append_null_aarch64 #define qlist_append_obj qlist_append_obj_aarch64 +#define qlist_append_str qlist_append_str_aarch64 #define qlist_copy qlist_copy_aarch64 #define qlist_copy_elem qlist_copy_elem_aarch64 #define qlist_destroy_obj qlist_destroy_obj_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 50577711..2f134370 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_aarch64eb #define memory_region_to_address_space memory_region_to_address_space_aarch64eb #define memory_region_transaction_begin memory_region_transaction_begin_aarch64eb #define memory_region_transaction_commit memory_region_transaction_commit_aarch64eb @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_aarch64eb #define qdict_next qdict_next_aarch64eb #define qdict_next_entry qdict_next_entry_aarch64eb +#define qdict_put_bool qdict_put_bool_aarch64eb +#define qdict_put_int qdict_put_int_aarch64eb +#define qdict_put_null qdict_put_null_aarch64eb #define qdict_put_obj qdict_put_obj_aarch64eb +#define qdict_put_str qdict_put_str_aarch64eb #define qdict_size qdict_size_aarch64eb #define qdict_type qdict_type_aarch64eb #define qemu_clock_get_us qemu_clock_get_us_aarch64eb @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_aarch64eb #define qint_get_int qint_get_int_aarch64eb #define qint_type qint_type_aarch64eb +#define qlist_append_bool qlist_append_bool_aarch64eb +#define qlist_append_int qlist_append_int_aarch64eb +#define qlist_append_null qlist_append_null_aarch64eb #define qlist_append_obj qlist_append_obj_aarch64eb +#define qlist_append_str qlist_append_str_aarch64eb #define qlist_copy qlist_copy_aarch64eb #define qlist_copy_elem qlist_copy_elem_aarch64eb #define qlist_destroy_obj qlist_destroy_obj_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 155decda..c5b0f1f0 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_arm #define memory_region_to_address_space memory_region_to_address_space_arm #define memory_region_transaction_begin memory_region_transaction_begin_arm #define memory_region_transaction_commit memory_region_transaction_commit_arm @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_arm #define qdict_next qdict_next_arm #define qdict_next_entry qdict_next_entry_arm +#define qdict_put_bool qdict_put_bool_arm +#define qdict_put_int qdict_put_int_arm +#define qdict_put_null qdict_put_null_arm #define qdict_put_obj qdict_put_obj_arm +#define qdict_put_str qdict_put_str_arm #define qdict_size qdict_size_arm #define qdict_type qdict_type_arm #define qemu_clock_get_us qemu_clock_get_us_arm @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_arm #define qint_get_int qint_get_int_arm #define qint_type qint_type_arm +#define qlist_append_bool qlist_append_bool_arm +#define qlist_append_int qlist_append_int_arm +#define qlist_append_null qlist_append_null_arm #define qlist_append_obj qlist_append_obj_arm +#define qlist_append_str qlist_append_str_arm #define qlist_copy qlist_copy_arm #define qlist_copy_elem qlist_copy_elem_arm #define qlist_destroy_obj qlist_destroy_obj_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index 2dd3eaed..9439b9ac 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_armeb #define memory_region_to_address_space memory_region_to_address_space_armeb #define memory_region_transaction_begin memory_region_transaction_begin_armeb #define memory_region_transaction_commit memory_region_transaction_commit_armeb @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_armeb #define qdict_next qdict_next_armeb #define qdict_next_entry qdict_next_entry_armeb +#define qdict_put_bool qdict_put_bool_armeb +#define qdict_put_int qdict_put_int_armeb +#define qdict_put_null qdict_put_null_armeb #define qdict_put_obj qdict_put_obj_armeb +#define qdict_put_str qdict_put_str_armeb #define qdict_size qdict_size_armeb #define qdict_type qdict_type_armeb #define qemu_clock_get_us qemu_clock_get_us_armeb @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_armeb #define qint_get_int qint_get_int_armeb #define qint_type qint_type_armeb +#define qlist_append_bool qlist_append_bool_armeb +#define qlist_append_int qlist_append_int_armeb +#define qlist_append_null qlist_append_null_armeb #define qlist_append_obj qlist_append_obj_armeb +#define qlist_append_str qlist_append_str_armeb #define qlist_copy qlist_copy_armeb #define qlist_copy_elem qlist_copy_elem_armeb #define qlist_destroy_obj qlist_destroy_obj_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 757c7426..b4e3e82e 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2448,7 +2448,6 @@ symbols = ( 'memory_region_set_readonly', 'memory_region_set_size', 'memory_region_size', - 'memory_region_test_and_clear_dirty', 'memory_region_to_address_space', 'memory_region_transaction_begin', 'memory_region_transaction_commit', diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h index 249f4c6b..d9a7b7fe 100644 --- a/qemu/include/exec/memory.h +++ b/qemu/include/exec/memory.h @@ -698,23 +698,6 @@ MemoryRegion *memory_region_from_host(struct uc_struct *uc, void *ptr, ram_addr_ */ void *memory_region_get_ram_ptr(MemoryRegion *mr); -/** - * memory_region_test_and_clear_dirty: Check whether a range of bytes is dirty - * for a specified client. It clears them. - * - * Checks whether a range of bytes has been written to since the last - * call to memory_region_reset_dirty() with the same @client. Dirty logging - * must be enabled. - * - * @mr: the memory region being queried. - * @addr: the address (relative to the start of the region) being queried. - * @size: the size of the range being queried. - * @client: the user of the logging information; %DIRTY_MEMORY_MIGRATION or - * %DIRTY_MEMORY_VGA. - */ -bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr, - hwaddr size, unsigned client); - /** * memory_region_set_readonly: Turn a memory region read-only (or read-write) * diff --git a/qemu/m68k.h b/qemu/m68k.h index 37be2e2d..532d30c0 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_m68k #define memory_region_to_address_space memory_region_to_address_space_m68k #define memory_region_transaction_begin memory_region_transaction_begin_m68k #define memory_region_transaction_commit memory_region_transaction_commit_m68k @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_m68k #define qdict_next qdict_next_m68k #define qdict_next_entry qdict_next_entry_m68k +#define qdict_put_bool qdict_put_bool_m68k +#define qdict_put_int qdict_put_int_m68k +#define qdict_put_null qdict_put_null_m68k #define qdict_put_obj qdict_put_obj_m68k +#define qdict_put_str qdict_put_str_m68k #define qdict_size qdict_size_m68k #define qdict_type qdict_type_m68k #define qemu_clock_get_us qemu_clock_get_us_m68k @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_m68k #define qint_get_int qint_get_int_m68k #define qint_type qint_type_m68k +#define qlist_append_bool qlist_append_bool_m68k +#define qlist_append_int qlist_append_int_m68k +#define qlist_append_null qlist_append_null_m68k #define qlist_append_obj qlist_append_obj_m68k +#define qlist_append_str qlist_append_str_m68k #define qlist_copy qlist_copy_m68k #define qlist_copy_elem qlist_copy_elem_m68k #define qlist_destroy_obj qlist_destroy_obj_m68k diff --git a/qemu/memory.c b/qemu/memory.c index ee3d8b97..8d41be64 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -1479,14 +1479,6 @@ ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr) return mr->ram_block ? mr->ram_block->offset : RAM_ADDR_INVALID; } -bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr, - hwaddr size, unsigned client) -{ - assert(mr->ram_block); - return cpu_physical_memory_test_and_clear_dirty(mr->uc, - memory_region_get_ram_addr(mr) + addr, size, client); -} - static void memory_region_update_container_subregions(MemoryRegion *subregion) { MemoryRegion *mr = subregion->container; diff --git a/qemu/mips.h b/qemu/mips.h index 67120c43..299d816c 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mips #define memory_region_to_address_space memory_region_to_address_space_mips #define memory_region_transaction_begin memory_region_transaction_begin_mips #define memory_region_transaction_commit memory_region_transaction_commit_mips @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_mips #define qdict_next qdict_next_mips #define qdict_next_entry qdict_next_entry_mips +#define qdict_put_bool qdict_put_bool_mips +#define qdict_put_int qdict_put_int_mips +#define qdict_put_null qdict_put_null_mips #define qdict_put_obj qdict_put_obj_mips +#define qdict_put_str qdict_put_str_mips #define qdict_size qdict_size_mips #define qdict_type qdict_type_mips #define qemu_clock_get_us qemu_clock_get_us_mips @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_mips #define qint_get_int qint_get_int_mips #define qint_type qint_type_mips +#define qlist_append_bool qlist_append_bool_mips +#define qlist_append_int qlist_append_int_mips +#define qlist_append_null qlist_append_null_mips #define qlist_append_obj qlist_append_obj_mips +#define qlist_append_str qlist_append_str_mips #define qlist_copy qlist_copy_mips #define qlist_copy_elem qlist_copy_elem_mips #define qlist_destroy_obj qlist_destroy_obj_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index ffbd96ca..3a6f09d7 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mips64 #define memory_region_to_address_space memory_region_to_address_space_mips64 #define memory_region_transaction_begin memory_region_transaction_begin_mips64 #define memory_region_transaction_commit memory_region_transaction_commit_mips64 @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_mips64 #define qdict_next qdict_next_mips64 #define qdict_next_entry qdict_next_entry_mips64 +#define qdict_put_bool qdict_put_bool_mips64 +#define qdict_put_int qdict_put_int_mips64 +#define qdict_put_null qdict_put_null_mips64 #define qdict_put_obj qdict_put_obj_mips64 +#define qdict_put_str qdict_put_str_mips64 #define qdict_size qdict_size_mips64 #define qdict_type qdict_type_mips64 #define qemu_clock_get_us qemu_clock_get_us_mips64 @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_mips64 #define qint_get_int qint_get_int_mips64 #define qint_type qint_type_mips64 +#define qlist_append_bool qlist_append_bool_mips64 +#define qlist_append_int qlist_append_int_mips64 +#define qlist_append_null qlist_append_null_mips64 #define qlist_append_obj qlist_append_obj_mips64 +#define qlist_append_str qlist_append_str_mips64 #define qlist_copy qlist_copy_mips64 #define qlist_copy_elem qlist_copy_elem_mips64 #define qlist_destroy_obj qlist_destroy_obj_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index f2b81489..dab784d5 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mips64el #define memory_region_to_address_space memory_region_to_address_space_mips64el #define memory_region_transaction_begin memory_region_transaction_begin_mips64el #define memory_region_transaction_commit memory_region_transaction_commit_mips64el @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_mips64el #define qdict_next qdict_next_mips64el #define qdict_next_entry qdict_next_entry_mips64el +#define qdict_put_bool qdict_put_bool_mips64el +#define qdict_put_int qdict_put_int_mips64el +#define qdict_put_null qdict_put_null_mips64el #define qdict_put_obj qdict_put_obj_mips64el +#define qdict_put_str qdict_put_str_mips64el #define qdict_size qdict_size_mips64el #define qdict_type qdict_type_mips64el #define qemu_clock_get_us qemu_clock_get_us_mips64el @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_mips64el #define qint_get_int qint_get_int_mips64el #define qint_type qint_type_mips64el +#define qlist_append_bool qlist_append_bool_mips64el +#define qlist_append_int qlist_append_int_mips64el +#define qlist_append_null qlist_append_null_mips64el #define qlist_append_obj qlist_append_obj_mips64el +#define qlist_append_str qlist_append_str_mips64el #define qlist_copy qlist_copy_mips64el #define qlist_copy_elem qlist_copy_elem_mips64el #define qlist_destroy_obj qlist_destroy_obj_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index e149e959..939de5a2 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mipsel #define memory_region_to_address_space memory_region_to_address_space_mipsel #define memory_region_transaction_begin memory_region_transaction_begin_mipsel #define memory_region_transaction_commit memory_region_transaction_commit_mipsel @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_mipsel #define qdict_next qdict_next_mipsel #define qdict_next_entry qdict_next_entry_mipsel +#define qdict_put_bool qdict_put_bool_mipsel +#define qdict_put_int qdict_put_int_mipsel +#define qdict_put_null qdict_put_null_mipsel #define qdict_put_obj qdict_put_obj_mipsel +#define qdict_put_str qdict_put_str_mipsel #define qdict_size qdict_size_mipsel #define qdict_type qdict_type_mipsel #define qemu_clock_get_us qemu_clock_get_us_mipsel @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_mipsel #define qint_get_int qint_get_int_mipsel #define qint_type qint_type_mipsel +#define qlist_append_bool qlist_append_bool_mipsel +#define qlist_append_int qlist_append_int_mipsel +#define qlist_append_null qlist_append_null_mipsel #define qlist_append_obj qlist_append_obj_mipsel +#define qlist_append_str qlist_append_str_mipsel #define qlist_copy qlist_copy_mipsel #define qlist_copy_elem qlist_copy_elem_mipsel #define qlist_destroy_obj qlist_destroy_obj_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 2273f608..955524c0 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_powerpc #define memory_region_to_address_space memory_region_to_address_space_powerpc #define memory_region_transaction_begin memory_region_transaction_begin_powerpc #define memory_region_transaction_commit memory_region_transaction_commit_powerpc @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_powerpc #define qdict_next qdict_next_powerpc #define qdict_next_entry qdict_next_entry_powerpc +#define qdict_put_bool qdict_put_bool_powerpc +#define qdict_put_int qdict_put_int_powerpc +#define qdict_put_null qdict_put_null_powerpc #define qdict_put_obj qdict_put_obj_powerpc +#define qdict_put_str qdict_put_str_powerpc #define qdict_size qdict_size_powerpc #define qdict_type qdict_type_powerpc #define qemu_clock_get_us qemu_clock_get_us_powerpc @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_powerpc #define qint_get_int qint_get_int_powerpc #define qint_type qint_type_powerpc +#define qlist_append_bool qlist_append_bool_powerpc +#define qlist_append_int qlist_append_int_powerpc +#define qlist_append_null qlist_append_null_powerpc #define qlist_append_obj qlist_append_obj_powerpc +#define qlist_append_str qlist_append_str_powerpc #define qlist_copy qlist_copy_powerpc #define qlist_copy_elem qlist_copy_elem_powerpc #define qlist_destroy_obj qlist_destroy_obj_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index abcf25c7..ec9b72cb 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_sparc #define memory_region_to_address_space memory_region_to_address_space_sparc #define memory_region_transaction_begin memory_region_transaction_begin_sparc #define memory_region_transaction_commit memory_region_transaction_commit_sparc @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_sparc #define qdict_next qdict_next_sparc #define qdict_next_entry qdict_next_entry_sparc +#define qdict_put_bool qdict_put_bool_sparc +#define qdict_put_int qdict_put_int_sparc +#define qdict_put_null qdict_put_null_sparc #define qdict_put_obj qdict_put_obj_sparc +#define qdict_put_str qdict_put_str_sparc #define qdict_size qdict_size_sparc #define qdict_type qdict_type_sparc #define qemu_clock_get_us qemu_clock_get_us_sparc @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_sparc #define qint_get_int qint_get_int_sparc #define qint_type qint_type_sparc +#define qlist_append_bool qlist_append_bool_sparc +#define qlist_append_int qlist_append_int_sparc +#define qlist_append_null qlist_append_null_sparc #define qlist_append_obj qlist_append_obj_sparc +#define qlist_append_str qlist_append_str_sparc #define qlist_copy qlist_copy_sparc #define qlist_copy_elem qlist_copy_elem_sparc #define qlist_destroy_obj qlist_destroy_obj_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index 61459474..f58c57cc 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_sparc64 #define memory_region_to_address_space memory_region_to_address_space_sparc64 #define memory_region_transaction_begin memory_region_transaction_begin_sparc64 #define memory_region_transaction_commit memory_region_transaction_commit_sparc64 @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_sparc64 #define qdict_next qdict_next_sparc64 #define qdict_next_entry qdict_next_entry_sparc64 +#define qdict_put_bool qdict_put_bool_sparc64 +#define qdict_put_int qdict_put_int_sparc64 +#define qdict_put_null qdict_put_null_sparc64 #define qdict_put_obj qdict_put_obj_sparc64 +#define qdict_put_str qdict_put_str_sparc64 #define qdict_size qdict_size_sparc64 #define qdict_type qdict_type_sparc64 #define qemu_clock_get_us qemu_clock_get_us_sparc64 @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_sparc64 #define qint_get_int qint_get_int_sparc64 #define qint_type qint_type_sparc64 +#define qlist_append_bool qlist_append_bool_sparc64 +#define qlist_append_int qlist_append_int_sparc64 +#define qlist_append_null qlist_append_null_sparc64 #define qlist_append_obj qlist_append_obj_sparc64 +#define qlist_append_str qlist_append_str_sparc64 #define qlist_copy qlist_copy_sparc64 #define qlist_copy_elem qlist_copy_elem_sparc64 #define qlist_destroy_obj qlist_destroy_obj_sparc64 diff --git a/qemu/x86_64.h b/qemu/x86_64.h index 0b26c437..0b81bbf7 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2442,7 +2442,6 @@ #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 -#define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_x86_64 #define memory_region_to_address_space memory_region_to_address_space_x86_64 #define memory_region_transaction_begin memory_region_transaction_begin_x86_64 #define memory_region_transaction_commit memory_region_transaction_commit_x86_64 @@ -2743,7 +2742,11 @@ #define qdict_new qdict_new_x86_64 #define qdict_next qdict_next_x86_64 #define qdict_next_entry qdict_next_entry_x86_64 +#define qdict_put_bool qdict_put_bool_x86_64 +#define qdict_put_int qdict_put_int_x86_64 +#define qdict_put_null qdict_put_null_x86_64 #define qdict_put_obj qdict_put_obj_x86_64 +#define qdict_put_str qdict_put_str_x86_64 #define qdict_size qdict_size_x86_64 #define qdict_type qdict_type_x86_64 #define qemu_clock_get_us qemu_clock_get_us_x86_64 @@ -2797,7 +2800,11 @@ #define qint_from_int qint_from_int_x86_64 #define qint_get_int qint_get_int_x86_64 #define qint_type qint_type_x86_64 +#define qlist_append_bool qlist_append_bool_x86_64 +#define qlist_append_int qlist_append_int_x86_64 +#define qlist_append_null qlist_append_null_x86_64 #define qlist_append_obj qlist_append_obj_x86_64 +#define qlist_append_str qlist_append_str_x86_64 #define qlist_copy qlist_copy_x86_64 #define qlist_copy_elem qlist_copy_elem_x86_64 #define qlist_destroy_obj qlist_destroy_obj_x86_64