diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index abbddfbd..0a6ec4fd 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_aarch64
 #define countLeadingZeros32 countLeadingZeros32_aarch64
 #define countLeadingZeros64 countLeadingZeros64_aarch64
-#define count_opts_list count_opts_list_aarch64
 #define cp_access_ok cp_access_ok_aarch64
 #define cpacr_write cpacr_write_aarch64
 #define cpreg_field_is_64bit cpreg_field_is_64bit_aarch64
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_aarch64
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_aarch64
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_aarch64
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_aarch64
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_aarch64
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_aarch64
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_aarch64
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_aarch64
 #define op_to_mov op_to_mov_aarch64
 #define op_to_movi op_to_movi_aarch64
-#define opts_accepts_any opts_accepts_any_aarch64
-#define opts_do_parse opts_do_parse_aarch64
-#define opt_set opt_set_aarch64
-#define opts_parse opts_parse_aarch64
 #define output_type_enum output_type_enum_aarch64
 #define packFloat128 packFloat128_aarch64
 #define packFloat16 packFloat16_aarch64
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_aarch64
 #define qemu_loglevel_mask qemu_loglevel_mask_aarch64
 #define qemu_log_vprintf qemu_log_vprintf_aarch64
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_aarch64
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_aarch64
 #define qemu_oom_check qemu_oom_check_aarch64
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_aarch64
-#define qemu_opts_append qemu_opts_append_aarch64
-#define qemu_opts_create qemu_opts_create_aarch64
-#define qemu_opts_del qemu_opts_del_aarch64
-#define qemu_opts_do_parse qemu_opts_do_parse_aarch64
-#define qemu_opts_find qemu_opts_find_aarch64
-#define qemu_opts_foreach qemu_opts_foreach_aarch64
-#define qemu_opts_free qemu_opts_free_aarch64
-#define qemu_opts_from_qdict qemu_opts_from_qdict_aarch64
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_aarch64
-#define qemu_opts_id qemu_opts_id_aarch64
-#define qemu_opts_parse qemu_opts_parse_aarch64
-#define qemu_opts_print qemu_opts_print_aarch64
-#define qemu_opts_print_help qemu_opts_print_help_aarch64
-#define qemu_opts_reset qemu_opts_reset_aarch64
-#define qemu_opts_set qemu_opts_set_aarch64
-#define qemu_opts_set_defaults qemu_opts_set_defaults_aarch64
-#define qemu_opts_set_id qemu_opts_set_id_aarch64
-#define qemu_opts_to_qdict qemu_opts_to_qdict_aarch64
-#define qemu_opts_validate qemu_opts_validate_aarch64
 #define qemu_parse_fd qemu_parse_fd_aarch64
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_aarch64
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_aarch64
diff --git a/qemu/arm.h b/qemu/arm.h
index e90b2cd5..bb29d7b2 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_arm
 #define countLeadingZeros32 countLeadingZeros32_arm
 #define countLeadingZeros64 countLeadingZeros64_arm
-#define count_opts_list count_opts_list_arm
 #define cp_access_ok cp_access_ok_arm
 #define cpacr_write cpacr_write_arm
 #define cpreg_field_is_64bit cpreg_field_is_64bit_arm
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_arm
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_arm
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_arm
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_arm
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_arm
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_arm
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_arm
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_arm
 #define op_to_mov op_to_mov_arm
 #define op_to_movi op_to_movi_arm
-#define opts_accepts_any opts_accepts_any_arm
-#define opts_do_parse opts_do_parse_arm
-#define opt_set opt_set_arm
-#define opts_parse opts_parse_arm
 #define output_type_enum output_type_enum_arm
 #define packFloat128 packFloat128_arm
 #define packFloat16 packFloat16_arm
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_arm
 #define qemu_loglevel_mask qemu_loglevel_mask_arm
 #define qemu_log_vprintf qemu_log_vprintf_arm
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_arm
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_arm
 #define qemu_oom_check qemu_oom_check_arm
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_arm
-#define qemu_opts_append qemu_opts_append_arm
-#define qemu_opts_create qemu_opts_create_arm
-#define qemu_opts_del qemu_opts_del_arm
-#define qemu_opts_do_parse qemu_opts_do_parse_arm
-#define qemu_opts_find qemu_opts_find_arm
-#define qemu_opts_foreach qemu_opts_foreach_arm
-#define qemu_opts_free qemu_opts_free_arm
-#define qemu_opts_from_qdict qemu_opts_from_qdict_arm
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_arm
-#define qemu_opts_id qemu_opts_id_arm
-#define qemu_opts_parse qemu_opts_parse_arm
-#define qemu_opts_print qemu_opts_print_arm
-#define qemu_opts_print_help qemu_opts_print_help_arm
-#define qemu_opts_reset qemu_opts_reset_arm
-#define qemu_opts_set qemu_opts_set_arm
-#define qemu_opts_set_defaults qemu_opts_set_defaults_arm
-#define qemu_opts_set_id qemu_opts_set_id_arm
-#define qemu_opts_to_qdict qemu_opts_to_qdict_arm
-#define qemu_opts_validate qemu_opts_validate_arm
 #define qemu_parse_fd qemu_parse_fd_arm
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_arm
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_arm
diff --git a/qemu/exec.c b/qemu/exec.c
index bffed758..892ebeb2 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -1357,7 +1357,6 @@ static void notdirty_mem_write(struct uc_struct* uc, void *opaque, hwaddr ram_ad
     default:
         abort();
     }
-    cpu_physical_memory_set_dirty_range_nocode(uc, ram_addr, size);
     /* we remove the notdirty callback only if the code has been
        flushed */
     if (!cpu_physical_memory_is_clean(uc, ram_addr)) {
@@ -1590,7 +1589,6 @@ static void invalidate_and_set_dirty(struct uc_struct *uc, hwaddr addr,
 {
     if (cpu_physical_memory_range_includes_clean(uc, addr, length)) {
         tb_invalidate_phys_range(uc, addr, addr + length, 0);
-        cpu_physical_memory_set_dirty_range_nocode(uc, addr, length);
     }
 }
 
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 0311f271..37e20633 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -206,7 +206,6 @@ symbols = (
     'count_cpreg',
     'countLeadingZeros32',
     'countLeadingZeros64',
-    'count_opts_list',
     'cp_access_ok',
     'cpacr_write',
     'cpreg_field_is_64bit',
@@ -276,7 +275,6 @@ symbols = (
     'cpu_physical_memory_rw',
     'cpu_physical_memory_set_dirty_flag',
     'cpu_physical_memory_set_dirty_range',
-    'cpu_physical_memory_set_dirty_range_nocode',
     'cpu_physical_memory_unmap',
     'cpu_physical_memory_write_rom',
     'cpu_physical_memory_write_rom_internal',
@@ -2187,10 +2185,6 @@ symbols = (
     'open_modeflags',
     'op_to_mov',
     'op_to_movi',
-    'opts_accepts_any',
-    'opts_do_parse',
-    'opt_set',
-    'opts_parse',
     'output_type_enum',
     'packFloat128',
     'packFloat16',
@@ -2403,29 +2397,7 @@ symbols = (
     'qemu_log_flush',
     'qemu_loglevel_mask',
     'qemu_log_vprintf',
-    'qemu_mutex_lock_ramlist',
-    'qemu_mutex_unlock_ramlist',
     'qemu_oom_check',
-    'qemu_opts_absorb_qdict',
-    'qemu_opts_append',
-    'qemu_opts_create',
-    'qemu_opts_del',
-    'qemu_opts_do_parse',
-    'qemu_opts_find',
-    'qemu_opts_foreach',
-    'qemu_opts_free',
-    'qemu_opts_from_qdict',
-    'qemu_opts_from_qdict_1',
-    'qemu_opts_id',
-    'qemu_opts_parse',
-    'qemu_opts_print',
-    'qemu_opts_print_help',
-    'qemu_opts_reset',
-    'qemu_opts_set',
-    'qemu_opts_set_defaults',
-    'qemu_opts_set_id',
-    'qemu_opts_to_qdict',
-    'qemu_opts_validate',
     'qemu_parse_fd',
     'qemu_ram_addr_from_host',
     'qemu_ram_addr_from_host_nofail',
diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h
index cc542d7b..2989edc0 100644
--- a/qemu/include/exec/memory.h
+++ b/qemu/include/exec/memory.h
@@ -16,10 +16,8 @@
 
 #ifndef CONFIG_USER_ONLY
 
-#define DIRTY_MEMORY_VGA       0
-#define DIRTY_MEMORY_CODE      1
-#define DIRTY_MEMORY_MIGRATION 2
-#define DIRTY_MEMORY_NUM       3        /* num of dirty bits */
+#define DIRTY_MEMORY_CODE      0
+#define DIRTY_MEMORY_NUM       1        /* num of dirty bits */
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/qemu/include/exec/ram_addr.h b/qemu/include/exec/ram_addr.h
index 01a646b4..a4c9007c 100644
--- a/qemu/include/exec/ram_addr.h
+++ b/qemu/include/exec/ram_addr.h
@@ -70,21 +70,13 @@ static inline bool cpu_physical_memory_get_dirty_flag(struct uc_struct *uc, ram_
 
 static inline bool cpu_physical_memory_is_clean(struct uc_struct *uc, ram_addr_t addr)
 {
-    bool vga = cpu_physical_memory_get_dirty_flag(uc, addr, DIRTY_MEMORY_VGA);
-    bool code = cpu_physical_memory_get_dirty_flag(uc, addr, DIRTY_MEMORY_CODE);
-    bool migration =
-        cpu_physical_memory_get_dirty_flag(uc, addr, DIRTY_MEMORY_MIGRATION);
-    return !(vga && code && migration);
+    return !cpu_physical_memory_get_dirty_flag(uc, addr, DIRTY_MEMORY_CODE);
 }
 
 static inline bool cpu_physical_memory_range_includes_clean(struct uc_struct *uc, ram_addr_t start,
                                                             ram_addr_t length)
 {
-    bool vga = cpu_physical_memory_get_clean(uc, start, length, DIRTY_MEMORY_VGA);
-    bool code = cpu_physical_memory_get_clean(uc, start, length, DIRTY_MEMORY_CODE);
-    bool migration =
-        cpu_physical_memory_get_clean(uc, start, length, DIRTY_MEMORY_MIGRATION);
-    return vga || code || migration;
+    return cpu_physical_memory_get_clean(uc, start, length, DIRTY_MEMORY_CODE);
 }
 
 static inline void cpu_physical_memory_set_dirty_flag(struct uc_struct *uc, ram_addr_t addr,
@@ -94,17 +86,6 @@ static inline void cpu_physical_memory_set_dirty_flag(struct uc_struct *uc, ram_
     set_bit(addr >> TARGET_PAGE_BITS, uc->ram_list.dirty_memory[client]);
 }
 
-static inline void cpu_physical_memory_set_dirty_range_nocode(struct uc_struct *uc, ram_addr_t start,
-                                                              ram_addr_t length)
-{
-    unsigned long end, page;
-
-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;
-    page = start >> TARGET_PAGE_BITS;
-    bitmap_set(uc->ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);
-    bitmap_set(uc->ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);
-}
-
 static inline void cpu_physical_memory_set_dirty_range(struct uc_struct *uc, ram_addr_t start,
                                                        ram_addr_t length)
 {
@@ -112,8 +93,6 @@ static inline void cpu_physical_memory_set_dirty_range(struct uc_struct *uc, ram
 
     end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;
     page = start >> TARGET_PAGE_BITS;
-    bitmap_set(uc->ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);
-    bitmap_set(uc->ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);
     bitmap_set(uc->ram_list.dirty_memory[DIRTY_MEMORY_CODE], page, end - page);
 }
 
@@ -139,9 +118,6 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(struct uc_struct *uc,
         for (k = 0; k < nr; k++) {
             if (bitmap[k]) {
                 unsigned long temp = leul_to_cpu(bitmap[k]);
-
-                uc->ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION][page + k] |= temp;
-                uc->ram_list.dirty_memory[DIRTY_MEMORY_VGA][page + k] |= temp;
                 uc->ram_list.dirty_memory[DIRTY_MEMORY_CODE][page + k] |= temp;
             }
         }
diff --git a/qemu/m68k.h b/qemu/m68k.h
index 0e695582..8297a9ec 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_m68k
 #define countLeadingZeros32 countLeadingZeros32_m68k
 #define countLeadingZeros64 countLeadingZeros64_m68k
-#define count_opts_list count_opts_list_m68k
 #define cp_access_ok cp_access_ok_m68k
 #define cpacr_write cpacr_write_m68k
 #define cpreg_field_is_64bit cpreg_field_is_64bit_m68k
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_m68k
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_m68k
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_m68k
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_m68k
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_m68k
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_m68k
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_m68k
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_m68k
 #define op_to_mov op_to_mov_m68k
 #define op_to_movi op_to_movi_m68k
-#define opts_accepts_any opts_accepts_any_m68k
-#define opts_do_parse opts_do_parse_m68k
-#define opt_set opt_set_m68k
-#define opts_parse opts_parse_m68k
 #define output_type_enum output_type_enum_m68k
 #define packFloat128 packFloat128_m68k
 #define packFloat16 packFloat16_m68k
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_m68k
 #define qemu_loglevel_mask qemu_loglevel_mask_m68k
 #define qemu_log_vprintf qemu_log_vprintf_m68k
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_m68k
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_m68k
 #define qemu_oom_check qemu_oom_check_m68k
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_m68k
-#define qemu_opts_append qemu_opts_append_m68k
-#define qemu_opts_create qemu_opts_create_m68k
-#define qemu_opts_del qemu_opts_del_m68k
-#define qemu_opts_do_parse qemu_opts_do_parse_m68k
-#define qemu_opts_find qemu_opts_find_m68k
-#define qemu_opts_foreach qemu_opts_foreach_m68k
-#define qemu_opts_free qemu_opts_free_m68k
-#define qemu_opts_from_qdict qemu_opts_from_qdict_m68k
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_m68k
-#define qemu_opts_id qemu_opts_id_m68k
-#define qemu_opts_parse qemu_opts_parse_m68k
-#define qemu_opts_print qemu_opts_print_m68k
-#define qemu_opts_print_help qemu_opts_print_help_m68k
-#define qemu_opts_reset qemu_opts_reset_m68k
-#define qemu_opts_set qemu_opts_set_m68k
-#define qemu_opts_set_defaults qemu_opts_set_defaults_m68k
-#define qemu_opts_set_id qemu_opts_set_id_m68k
-#define qemu_opts_to_qdict qemu_opts_to_qdict_m68k
-#define qemu_opts_validate qemu_opts_validate_m68k
 #define qemu_parse_fd qemu_parse_fd_m68k
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_m68k
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_m68k
diff --git a/qemu/mips.h b/qemu/mips.h
index 3b136883..a0c5727b 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_mips
 #define countLeadingZeros32 countLeadingZeros32_mips
 #define countLeadingZeros64 countLeadingZeros64_mips
-#define count_opts_list count_opts_list_mips
 #define cp_access_ok cp_access_ok_mips
 #define cpacr_write cpacr_write_mips
 #define cpreg_field_is_64bit cpreg_field_is_64bit_mips
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_mips
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_mips
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_mips
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_mips
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_mips
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_mips
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_mips
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_mips
 #define op_to_mov op_to_mov_mips
 #define op_to_movi op_to_movi_mips
-#define opts_accepts_any opts_accepts_any_mips
-#define opts_do_parse opts_do_parse_mips
-#define opt_set opt_set_mips
-#define opts_parse opts_parse_mips
 #define output_type_enum output_type_enum_mips
 #define packFloat128 packFloat128_mips
 #define packFloat16 packFloat16_mips
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_mips
 #define qemu_loglevel_mask qemu_loglevel_mask_mips
 #define qemu_log_vprintf qemu_log_vprintf_mips
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mips
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mips
 #define qemu_oom_check qemu_oom_check_mips
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mips
-#define qemu_opts_append qemu_opts_append_mips
-#define qemu_opts_create qemu_opts_create_mips
-#define qemu_opts_del qemu_opts_del_mips
-#define qemu_opts_do_parse qemu_opts_do_parse_mips
-#define qemu_opts_find qemu_opts_find_mips
-#define qemu_opts_foreach qemu_opts_foreach_mips
-#define qemu_opts_free qemu_opts_free_mips
-#define qemu_opts_from_qdict qemu_opts_from_qdict_mips
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_mips
-#define qemu_opts_id qemu_opts_id_mips
-#define qemu_opts_parse qemu_opts_parse_mips
-#define qemu_opts_print qemu_opts_print_mips
-#define qemu_opts_print_help qemu_opts_print_help_mips
-#define qemu_opts_reset qemu_opts_reset_mips
-#define qemu_opts_set qemu_opts_set_mips
-#define qemu_opts_set_defaults qemu_opts_set_defaults_mips
-#define qemu_opts_set_id qemu_opts_set_id_mips
-#define qemu_opts_to_qdict qemu_opts_to_qdict_mips
-#define qemu_opts_validate qemu_opts_validate_mips
 #define qemu_parse_fd qemu_parse_fd_mips
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mips
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index 5f4465bb..b2c62cff 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_mips64
 #define countLeadingZeros32 countLeadingZeros32_mips64
 #define countLeadingZeros64 countLeadingZeros64_mips64
-#define count_opts_list count_opts_list_mips64
 #define cp_access_ok cp_access_ok_mips64
 #define cpacr_write cpacr_write_mips64
 #define cpreg_field_is_64bit cpreg_field_is_64bit_mips64
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_mips64
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_mips64
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_mips64
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_mips64
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_mips64
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_mips64
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_mips64
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_mips64
 #define op_to_mov op_to_mov_mips64
 #define op_to_movi op_to_movi_mips64
-#define opts_accepts_any opts_accepts_any_mips64
-#define opts_do_parse opts_do_parse_mips64
-#define opt_set opt_set_mips64
-#define opts_parse opts_parse_mips64
 #define output_type_enum output_type_enum_mips64
 #define packFloat128 packFloat128_mips64
 #define packFloat16 packFloat16_mips64
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_mips64
 #define qemu_loglevel_mask qemu_loglevel_mask_mips64
 #define qemu_log_vprintf qemu_log_vprintf_mips64
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mips64
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mips64
 #define qemu_oom_check qemu_oom_check_mips64
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mips64
-#define qemu_opts_append qemu_opts_append_mips64
-#define qemu_opts_create qemu_opts_create_mips64
-#define qemu_opts_del qemu_opts_del_mips64
-#define qemu_opts_do_parse qemu_opts_do_parse_mips64
-#define qemu_opts_find qemu_opts_find_mips64
-#define qemu_opts_foreach qemu_opts_foreach_mips64
-#define qemu_opts_free qemu_opts_free_mips64
-#define qemu_opts_from_qdict qemu_opts_from_qdict_mips64
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_mips64
-#define qemu_opts_id qemu_opts_id_mips64
-#define qemu_opts_parse qemu_opts_parse_mips64
-#define qemu_opts_print qemu_opts_print_mips64
-#define qemu_opts_print_help qemu_opts_print_help_mips64
-#define qemu_opts_reset qemu_opts_reset_mips64
-#define qemu_opts_set qemu_opts_set_mips64
-#define qemu_opts_set_defaults qemu_opts_set_defaults_mips64
-#define qemu_opts_set_id qemu_opts_set_id_mips64
-#define qemu_opts_to_qdict qemu_opts_to_qdict_mips64
-#define qemu_opts_validate qemu_opts_validate_mips64
 #define qemu_parse_fd qemu_parse_fd_mips64
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mips64
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index 416c9ea5..617bc44d 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_mips64el
 #define countLeadingZeros32 countLeadingZeros32_mips64el
 #define countLeadingZeros64 countLeadingZeros64_mips64el
-#define count_opts_list count_opts_list_mips64el
 #define cp_access_ok cp_access_ok_mips64el
 #define cpacr_write cpacr_write_mips64el
 #define cpreg_field_is_64bit cpreg_field_is_64bit_mips64el
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_mips64el
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_mips64el
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_mips64el
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_mips64el
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_mips64el
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_mips64el
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_mips64el
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_mips64el
 #define op_to_mov op_to_mov_mips64el
 #define op_to_movi op_to_movi_mips64el
-#define opts_accepts_any opts_accepts_any_mips64el
-#define opts_do_parse opts_do_parse_mips64el
-#define opt_set opt_set_mips64el
-#define opts_parse opts_parse_mips64el
 #define output_type_enum output_type_enum_mips64el
 #define packFloat128 packFloat128_mips64el
 #define packFloat16 packFloat16_mips64el
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_mips64el
 #define qemu_loglevel_mask qemu_loglevel_mask_mips64el
 #define qemu_log_vprintf qemu_log_vprintf_mips64el
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mips64el
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mips64el
 #define qemu_oom_check qemu_oom_check_mips64el
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mips64el
-#define qemu_opts_append qemu_opts_append_mips64el
-#define qemu_opts_create qemu_opts_create_mips64el
-#define qemu_opts_del qemu_opts_del_mips64el
-#define qemu_opts_do_parse qemu_opts_do_parse_mips64el
-#define qemu_opts_find qemu_opts_find_mips64el
-#define qemu_opts_foreach qemu_opts_foreach_mips64el
-#define qemu_opts_free qemu_opts_free_mips64el
-#define qemu_opts_from_qdict qemu_opts_from_qdict_mips64el
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_mips64el
-#define qemu_opts_id qemu_opts_id_mips64el
-#define qemu_opts_parse qemu_opts_parse_mips64el
-#define qemu_opts_print qemu_opts_print_mips64el
-#define qemu_opts_print_help qemu_opts_print_help_mips64el
-#define qemu_opts_reset qemu_opts_reset_mips64el
-#define qemu_opts_set qemu_opts_set_mips64el
-#define qemu_opts_set_defaults qemu_opts_set_defaults_mips64el
-#define qemu_opts_set_id qemu_opts_set_id_mips64el
-#define qemu_opts_to_qdict qemu_opts_to_qdict_mips64el
-#define qemu_opts_validate qemu_opts_validate_mips64el
 #define qemu_parse_fd qemu_parse_fd_mips64el
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mips64el
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index d6cc23d5..1dc1af12 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_mipsel
 #define countLeadingZeros32 countLeadingZeros32_mipsel
 #define countLeadingZeros64 countLeadingZeros64_mipsel
-#define count_opts_list count_opts_list_mipsel
 #define cp_access_ok cp_access_ok_mipsel
 #define cpacr_write cpacr_write_mipsel
 #define cpreg_field_is_64bit cpreg_field_is_64bit_mipsel
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_mipsel
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_mipsel
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_mipsel
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_mipsel
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_mipsel
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_mipsel
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_mipsel
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_mipsel
 #define op_to_mov op_to_mov_mipsel
 #define op_to_movi op_to_movi_mipsel
-#define opts_accepts_any opts_accepts_any_mipsel
-#define opts_do_parse opts_do_parse_mipsel
-#define opt_set opt_set_mipsel
-#define opts_parse opts_parse_mipsel
 #define output_type_enum output_type_enum_mipsel
 #define packFloat128 packFloat128_mipsel
 #define packFloat16 packFloat16_mipsel
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_mipsel
 #define qemu_loglevel_mask qemu_loglevel_mask_mipsel
 #define qemu_log_vprintf qemu_log_vprintf_mipsel
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_mipsel
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_mipsel
 #define qemu_oom_check qemu_oom_check_mipsel
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_mipsel
-#define qemu_opts_append qemu_opts_append_mipsel
-#define qemu_opts_create qemu_opts_create_mipsel
-#define qemu_opts_del qemu_opts_del_mipsel
-#define qemu_opts_do_parse qemu_opts_do_parse_mipsel
-#define qemu_opts_find qemu_opts_find_mipsel
-#define qemu_opts_foreach qemu_opts_foreach_mipsel
-#define qemu_opts_free qemu_opts_free_mipsel
-#define qemu_opts_from_qdict qemu_opts_from_qdict_mipsel
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_mipsel
-#define qemu_opts_id qemu_opts_id_mipsel
-#define qemu_opts_parse qemu_opts_parse_mipsel
-#define qemu_opts_print qemu_opts_print_mipsel
-#define qemu_opts_print_help qemu_opts_print_help_mipsel
-#define qemu_opts_reset qemu_opts_reset_mipsel
-#define qemu_opts_set qemu_opts_set_mipsel
-#define qemu_opts_set_defaults qemu_opts_set_defaults_mipsel
-#define qemu_opts_set_id qemu_opts_set_id_mipsel
-#define qemu_opts_to_qdict qemu_opts_to_qdict_mipsel
-#define qemu_opts_validate qemu_opts_validate_mipsel
 #define qemu_parse_fd qemu_parse_fd_mipsel
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_mipsel
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index 506339dc..8ca1c9a7 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_powerpc
 #define countLeadingZeros32 countLeadingZeros32_powerpc
 #define countLeadingZeros64 countLeadingZeros64_powerpc
-#define count_opts_list count_opts_list_powerpc
 #define cp_access_ok cp_access_ok_powerpc
 #define cpacr_write cpacr_write_powerpc
 #define cpreg_field_is_64bit cpreg_field_is_64bit_powerpc
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_powerpc
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_powerpc
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_powerpc
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_powerpc
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_powerpc
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_powerpc
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_powerpc
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_powerpc
 #define op_to_mov op_to_mov_powerpc
 #define op_to_movi op_to_movi_powerpc
-#define opts_accepts_any opts_accepts_any_powerpc
-#define opts_do_parse opts_do_parse_powerpc
-#define opt_set opt_set_powerpc
-#define opts_parse opts_parse_powerpc
 #define output_type_enum output_type_enum_powerpc
 #define packFloat128 packFloat128_powerpc
 #define packFloat16 packFloat16_powerpc
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_powerpc
 #define qemu_loglevel_mask qemu_loglevel_mask_powerpc
 #define qemu_log_vprintf qemu_log_vprintf_powerpc
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_powerpc
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_powerpc
 #define qemu_oom_check qemu_oom_check_powerpc
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_powerpc
-#define qemu_opts_append qemu_opts_append_powerpc
-#define qemu_opts_create qemu_opts_create_powerpc
-#define qemu_opts_del qemu_opts_del_powerpc
-#define qemu_opts_do_parse qemu_opts_do_parse_powerpc
-#define qemu_opts_find qemu_opts_find_powerpc
-#define qemu_opts_foreach qemu_opts_foreach_powerpc
-#define qemu_opts_free qemu_opts_free_powerpc
-#define qemu_opts_from_qdict qemu_opts_from_qdict_powerpc
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_powerpc
-#define qemu_opts_id qemu_opts_id_powerpc
-#define qemu_opts_parse qemu_opts_parse_powerpc
-#define qemu_opts_print qemu_opts_print_powerpc
-#define qemu_opts_print_help qemu_opts_print_help_powerpc
-#define qemu_opts_reset qemu_opts_reset_powerpc
-#define qemu_opts_set qemu_opts_set_powerpc
-#define qemu_opts_set_defaults qemu_opts_set_defaults_powerpc
-#define qemu_opts_set_id qemu_opts_set_id_powerpc
-#define qemu_opts_to_qdict qemu_opts_to_qdict_powerpc
-#define qemu_opts_validate qemu_opts_validate_powerpc
 #define qemu_parse_fd qemu_parse_fd_powerpc
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_powerpc
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_powerpc
diff --git a/qemu/sparc.h b/qemu/sparc.h
index dc40b36e..2151cff7 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_sparc
 #define countLeadingZeros32 countLeadingZeros32_sparc
 #define countLeadingZeros64 countLeadingZeros64_sparc
-#define count_opts_list count_opts_list_sparc
 #define cp_access_ok cp_access_ok_sparc
 #define cpacr_write cpacr_write_sparc
 #define cpreg_field_is_64bit cpreg_field_is_64bit_sparc
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_sparc
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_sparc
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_sparc
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_sparc
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_sparc
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_sparc
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_sparc
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_sparc
 #define op_to_mov op_to_mov_sparc
 #define op_to_movi op_to_movi_sparc
-#define opts_accepts_any opts_accepts_any_sparc
-#define opts_do_parse opts_do_parse_sparc
-#define opt_set opt_set_sparc
-#define opts_parse opts_parse_sparc
 #define output_type_enum output_type_enum_sparc
 #define packFloat128 packFloat128_sparc
 #define packFloat16 packFloat16_sparc
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_sparc
 #define qemu_loglevel_mask qemu_loglevel_mask_sparc
 #define qemu_log_vprintf qemu_log_vprintf_sparc
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_sparc
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_sparc
 #define qemu_oom_check qemu_oom_check_sparc
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_sparc
-#define qemu_opts_append qemu_opts_append_sparc
-#define qemu_opts_create qemu_opts_create_sparc
-#define qemu_opts_del qemu_opts_del_sparc
-#define qemu_opts_do_parse qemu_opts_do_parse_sparc
-#define qemu_opts_find qemu_opts_find_sparc
-#define qemu_opts_foreach qemu_opts_foreach_sparc
-#define qemu_opts_free qemu_opts_free_sparc
-#define qemu_opts_from_qdict qemu_opts_from_qdict_sparc
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_sparc
-#define qemu_opts_id qemu_opts_id_sparc
-#define qemu_opts_parse qemu_opts_parse_sparc
-#define qemu_opts_print qemu_opts_print_sparc
-#define qemu_opts_print_help qemu_opts_print_help_sparc
-#define qemu_opts_reset qemu_opts_reset_sparc
-#define qemu_opts_set qemu_opts_set_sparc
-#define qemu_opts_set_defaults qemu_opts_set_defaults_sparc
-#define qemu_opts_set_id qemu_opts_set_id_sparc
-#define qemu_opts_to_qdict qemu_opts_to_qdict_sparc
-#define qemu_opts_validate qemu_opts_validate_sparc
 #define qemu_parse_fd qemu_parse_fd_sparc
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_sparc
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index b9d70ea4..b19b68ce 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_sparc64
 #define countLeadingZeros32 countLeadingZeros32_sparc64
 #define countLeadingZeros64 countLeadingZeros64_sparc64
-#define count_opts_list count_opts_list_sparc64
 #define cp_access_ok cp_access_ok_sparc64
 #define cpacr_write cpacr_write_sparc64
 #define cpreg_field_is_64bit cpreg_field_is_64bit_sparc64
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_sparc64
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_sparc64
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_sparc64
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_sparc64
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_sparc64
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_sparc64
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_sparc64
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_sparc64
 #define op_to_mov op_to_mov_sparc64
 #define op_to_movi op_to_movi_sparc64
-#define opts_accepts_any opts_accepts_any_sparc64
-#define opts_do_parse opts_do_parse_sparc64
-#define opt_set opt_set_sparc64
-#define opts_parse opts_parse_sparc64
 #define output_type_enum output_type_enum_sparc64
 #define packFloat128 packFloat128_sparc64
 #define packFloat16 packFloat16_sparc64
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_sparc64
 #define qemu_loglevel_mask qemu_loglevel_mask_sparc64
 #define qemu_log_vprintf qemu_log_vprintf_sparc64
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_sparc64
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_sparc64
 #define qemu_oom_check qemu_oom_check_sparc64
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_sparc64
-#define qemu_opts_append qemu_opts_append_sparc64
-#define qemu_opts_create qemu_opts_create_sparc64
-#define qemu_opts_del qemu_opts_del_sparc64
-#define qemu_opts_do_parse qemu_opts_do_parse_sparc64
-#define qemu_opts_find qemu_opts_find_sparc64
-#define qemu_opts_foreach qemu_opts_foreach_sparc64
-#define qemu_opts_free qemu_opts_free_sparc64
-#define qemu_opts_from_qdict qemu_opts_from_qdict_sparc64
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_sparc64
-#define qemu_opts_id qemu_opts_id_sparc64
-#define qemu_opts_parse qemu_opts_parse_sparc64
-#define qemu_opts_print qemu_opts_print_sparc64
-#define qemu_opts_print_help qemu_opts_print_help_sparc64
-#define qemu_opts_reset qemu_opts_reset_sparc64
-#define qemu_opts_set qemu_opts_set_sparc64
-#define qemu_opts_set_defaults qemu_opts_set_defaults_sparc64
-#define qemu_opts_set_id qemu_opts_set_id_sparc64
-#define qemu_opts_to_qdict qemu_opts_to_qdict_sparc64
-#define qemu_opts_validate qemu_opts_validate_sparc64
 #define qemu_parse_fd qemu_parse_fd_sparc64
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_sparc64
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_sparc64
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index cc9bb869..3f23d57e 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -200,7 +200,6 @@
 #define count_cpreg count_cpreg_x86_64
 #define countLeadingZeros32 countLeadingZeros32_x86_64
 #define countLeadingZeros64 countLeadingZeros64_x86_64
-#define count_opts_list count_opts_list_x86_64
 #define cp_access_ok cp_access_ok_x86_64
 #define cpacr_write cpacr_write_x86_64
 #define cpreg_field_is_64bit cpreg_field_is_64bit_x86_64
@@ -270,7 +269,6 @@
 #define cpu_physical_memory_rw cpu_physical_memory_rw_x86_64
 #define cpu_physical_memory_set_dirty_flag cpu_physical_memory_set_dirty_flag_x86_64
 #define cpu_physical_memory_set_dirty_range cpu_physical_memory_set_dirty_range_x86_64
-#define cpu_physical_memory_set_dirty_range_nocode cpu_physical_memory_set_dirty_range_nocode_x86_64
 #define cpu_physical_memory_unmap cpu_physical_memory_unmap_x86_64
 #define cpu_physical_memory_write_rom cpu_physical_memory_write_rom_x86_64
 #define cpu_physical_memory_write_rom_internal cpu_physical_memory_write_rom_internal_x86_64
@@ -2181,10 +2179,6 @@
 #define open_modeflags open_modeflags_x86_64
 #define op_to_mov op_to_mov_x86_64
 #define op_to_movi op_to_movi_x86_64
-#define opts_accepts_any opts_accepts_any_x86_64
-#define opts_do_parse opts_do_parse_x86_64
-#define opt_set opt_set_x86_64
-#define opts_parse opts_parse_x86_64
 #define output_type_enum output_type_enum_x86_64
 #define packFloat128 packFloat128_x86_64
 #define packFloat16 packFloat16_x86_64
@@ -2397,29 +2391,7 @@
 #define qemu_log_flush qemu_log_flush_x86_64
 #define qemu_loglevel_mask qemu_loglevel_mask_x86_64
 #define qemu_log_vprintf qemu_log_vprintf_x86_64
-#define qemu_mutex_lock_ramlist qemu_mutex_lock_ramlist_x86_64
-#define qemu_mutex_unlock_ramlist qemu_mutex_unlock_ramlist_x86_64
 #define qemu_oom_check qemu_oom_check_x86_64
-#define qemu_opts_absorb_qdict qemu_opts_absorb_qdict_x86_64
-#define qemu_opts_append qemu_opts_append_x86_64
-#define qemu_opts_create qemu_opts_create_x86_64
-#define qemu_opts_del qemu_opts_del_x86_64
-#define qemu_opts_do_parse qemu_opts_do_parse_x86_64
-#define qemu_opts_find qemu_opts_find_x86_64
-#define qemu_opts_foreach qemu_opts_foreach_x86_64
-#define qemu_opts_free qemu_opts_free_x86_64
-#define qemu_opts_from_qdict qemu_opts_from_qdict_x86_64
-#define qemu_opts_from_qdict_1 qemu_opts_from_qdict_1_x86_64
-#define qemu_opts_id qemu_opts_id_x86_64
-#define qemu_opts_parse qemu_opts_parse_x86_64
-#define qemu_opts_print qemu_opts_print_x86_64
-#define qemu_opts_print_help qemu_opts_print_help_x86_64
-#define qemu_opts_reset qemu_opts_reset_x86_64
-#define qemu_opts_set qemu_opts_set_x86_64
-#define qemu_opts_set_defaults qemu_opts_set_defaults_x86_64
-#define qemu_opts_set_id qemu_opts_set_id_x86_64
-#define qemu_opts_to_qdict qemu_opts_to_qdict_x86_64
-#define qemu_opts_validate qemu_opts_validate_x86_64
 #define qemu_parse_fd qemu_parse_fd_x86_64
 #define qemu_ram_addr_from_host qemu_ram_addr_from_host_x86_64
 #define qemu_ram_addr_from_host_nofail qemu_ram_addr_from_host_nofail_x86_64