diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index cc0930ea..b641ed02 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_aarch64
 #define memory_region_name memory_region_name_aarch64
 #define memory_region_need_escape memory_region_need_escape_aarch64
-#define memory_region_notify_iommu memory_region_notify_iommu_aarch64
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_aarch64
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_aarch64
 #define memory_region_present memory_region_present_aarch64
 #define memory_region_read_accessor memory_region_read_accessor_aarch64
 #define memory_region_readd_subregion memory_region_readd_subregion_aarch64
 #define memory_region_ref memory_region_ref_aarch64
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_aarch64
 #define memory_region_resolve_container memory_region_resolve_container_aarch64
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_aarch64
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_aarch64
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_aarch64
 #define memory_region_transaction_commit memory_region_transaction_commit_aarch64
 #define memory_region_unref memory_region_unref_aarch64
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_aarch64
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_aarch64
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_aarch64
 #define memory_region_update_container_subregions memory_region_update_container_subregions_aarch64
diff --git a/qemu/arm.h b/qemu/arm.h
index 32a30644..090ec4de 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_arm
 #define memory_region_name memory_region_name_arm
 #define memory_region_need_escape memory_region_need_escape_arm
-#define memory_region_notify_iommu memory_region_notify_iommu_arm
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_arm
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_arm
 #define memory_region_present memory_region_present_arm
 #define memory_region_read_accessor memory_region_read_accessor_arm
 #define memory_region_readd_subregion memory_region_readd_subregion_arm
 #define memory_region_ref memory_region_ref_arm
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_arm
 #define memory_region_resolve_container memory_region_resolve_container_arm
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_arm
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_arm
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_arm
 #define memory_region_transaction_commit memory_region_transaction_commit_arm
 #define memory_region_unref memory_region_unref_arm
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_arm
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_arm
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_arm
 #define memory_region_update_container_subregions memory_region_update_container_subregions_arm
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 7d59f495..35b84d4d 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -2067,14 +2067,12 @@ symbols = (
     'memory_region_is_unassigned',
     'memory_region_name',
     'memory_region_need_escape',
-    'memory_region_notify_iommu',
     'memory_region_oldmmio_read_accessor',
     'memory_region_oldmmio_write_accessor',
     'memory_region_present',
     'memory_region_read_accessor',
     'memory_region_readd_subregion',
     'memory_region_ref',
-    'memory_region_register_iommu_notifier',
     'memory_region_resolve_container',
     'memory_region_rom_device_set_romd',
     'memory_region_section_get_iotlb',
@@ -2088,7 +2086,6 @@ symbols = (
     'memory_region_transaction_begin',
     'memory_region_transaction_commit',
     'memory_region_unref',
-    'memory_region_unregister_iommu_notifier',
     'memory_region_update_coalesced_range',
     'memory_region_update_coalesced_range_as',
     'memory_region_update_container_subregions',
diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h
index 9dc25cf1..cc542d7b 100644
--- a/qemu/include/exec/memory.h
+++ b/qemu/include/exec/memory.h
@@ -30,7 +30,6 @@
 #endif
 #include "qemu/queue.h"
 #include "qemu/int128.h"
-#include "qemu/notify.h"
 #include "qapi/error.h"
 #include "qom/object.h"
 
@@ -168,7 +167,6 @@ struct MemoryRegion {
     uint8_t dirty_log_mask;
     unsigned ioeventfd_nb;
     MemoryRegionIoeventfd *ioeventfds;
-    NotifierList iommu_notify;
     struct uc_struct *uc;
     uint32_t perms;   //all perms, partially redundant with readonly
     uint64_t end;
@@ -486,25 +484,6 @@ bool memory_region_is_iommu(MemoryRegion *mr);
 void memory_region_notify_iommu(MemoryRegion *mr,
                                 IOMMUTLBEntry entry);
 
-/**
- * memory_region_register_iommu_notifier: register a notifier for changes to
- * IOMMU translation entries.
- *
- * @mr: the memory region to observe
- * @n: the notifier to be added; the notifier receives a pointer to an
- *     #IOMMUTLBEntry as the opaque value; the pointer ceases to be
- *     valid on exit from the notifier.
- */
-void memory_region_register_iommu_notifier(MemoryRegion *mr, Notifier *n);
-
-/**
- * memory_region_unregister_iommu_notifier: unregister a notifier for
- * changes to IOMMU translation entries.
- *
- * @n: the notifier to be removed.
- */
-void memory_region_unregister_iommu_notifier(Notifier *n);
-
 /**
  * memory_region_name: get a memory region's name
  *
diff --git a/qemu/include/qemu/notify.h b/qemu/include/qemu/notify.h
deleted file mode 100644
index a3d73e4b..00000000
--- a/qemu/include/qemu/notify.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Notifier lists
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_NOTIFY_H
-#define QEMU_NOTIFY_H
-
-#include "qemu/queue.h"
-
-typedef struct Notifier Notifier;
-
-struct Notifier
-{
-    void (*notify)(Notifier *notifier, void *data);
-    QLIST_ENTRY(Notifier) node;
-};
-
-typedef struct NotifierList
-{
-    QLIST_HEAD(, Notifier) notifiers;
-} NotifierList;
-
-#define NOTIFIER_LIST_INITIALIZER(head) \
-    { QLIST_HEAD_INITIALIZER((head).notifiers) }
-
-void notifier_list_init(NotifierList *list);
-
-void notifier_list_add(NotifierList *list, Notifier *notifier);
-
-void notifier_remove(Notifier *notifier);
-
-void notifier_list_notify(NotifierList *list, void *data);
-
-/* Same as Notifier but allows .notify() to return errors */
-typedef struct NotifierWithReturn NotifierWithReturn;
-
-struct NotifierWithReturn {
-    /**
-     * Return 0 on success (next notifier will be invoked), otherwise
-     * notifier_with_return_list_notify() will stop and return the value.
-     */
-    int (*notify)(NotifierWithReturn *notifier, void *data);
-    QLIST_ENTRY(NotifierWithReturn) node;
-};
-
-typedef struct NotifierWithReturnList {
-    QLIST_HEAD(, NotifierWithReturn) notifiers;
-} NotifierWithReturnList;
-
-#define NOTIFIER_WITH_RETURN_LIST_INITIALIZER(head) \
-    { QLIST_HEAD_INITIALIZER((head).notifiers) }
-
-void notifier_with_return_list_init(NotifierWithReturnList *list);
-
-void notifier_with_return_list_add(NotifierWithReturnList *list,
-                                   NotifierWithReturn *notifier);
-
-void notifier_with_return_remove(NotifierWithReturn *notifier);
-
-int notifier_with_return_list_notify(NotifierWithReturnList *list,
-                                     void *data);
-
-#endif
diff --git a/qemu/include/qemu/timer.h b/qemu/include/qemu/timer.h
index f3612863..f0e4de6f 100644
--- a/qemu/include/qemu/timer.h
+++ b/qemu/include/qemu/timer.h
@@ -3,7 +3,6 @@
 
 #include "qemu/typedefs.h"
 #include "qemu-common.h"
-#include "qemu/notify.h"
 
 /* timers */
 
diff --git a/qemu/m68k.h b/qemu/m68k.h
index 9e44287c..b6c94a0d 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_m68k
 #define memory_region_name memory_region_name_m68k
 #define memory_region_need_escape memory_region_need_escape_m68k
-#define memory_region_notify_iommu memory_region_notify_iommu_m68k
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_m68k
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_m68k
 #define memory_region_present memory_region_present_m68k
 #define memory_region_read_accessor memory_region_read_accessor_m68k
 #define memory_region_readd_subregion memory_region_readd_subregion_m68k
 #define memory_region_ref memory_region_ref_m68k
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_m68k
 #define memory_region_resolve_container memory_region_resolve_container_m68k
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_m68k
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_m68k
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_m68k
 #define memory_region_transaction_commit memory_region_transaction_commit_m68k
 #define memory_region_unref memory_region_unref_m68k
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_m68k
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_m68k
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_m68k
 #define memory_region_update_container_subregions memory_region_update_container_subregions_m68k
diff --git a/qemu/memory.c b/qemu/memory.c
index 453ddce1..70b13310 100644
--- a/qemu/memory.c
+++ b/qemu/memory.c
@@ -1359,23 +1359,6 @@ bool memory_region_is_iommu(MemoryRegion *mr)
     return mr->iommu_ops;
 }
 
-void memory_region_register_iommu_notifier(MemoryRegion *mr, Notifier *n)
-{
-    //notifier_list_add(&mr->iommu_notify, n);
-}
-
-void memory_region_unregister_iommu_notifier(Notifier *n)
-{
-    //notifier_remove(n);
-}
-
-void memory_region_notify_iommu(MemoryRegion *mr,
-                                IOMMUTLBEntry entry)
-{
-    assert(memory_region_is_iommu(mr));
-    //notifier_list_notify(&mr->iommu_notify, &entry);
-}
-
 void memory_region_set_readonly(MemoryRegion *mr, bool readonly)
 {
     if (mr->readonly != readonly) {
diff --git a/qemu/mips.h b/qemu/mips.h
index abc40b8a..18e73078 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_mips
 #define memory_region_name memory_region_name_mips
 #define memory_region_need_escape memory_region_need_escape_mips
-#define memory_region_notify_iommu memory_region_notify_iommu_mips
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_mips
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_mips
 #define memory_region_present memory_region_present_mips
 #define memory_region_read_accessor memory_region_read_accessor_mips
 #define memory_region_readd_subregion memory_region_readd_subregion_mips
 #define memory_region_ref memory_region_ref_mips
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_mips
 #define memory_region_resolve_container memory_region_resolve_container_mips
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_mips
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_mips
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_mips
 #define memory_region_transaction_commit memory_region_transaction_commit_mips
 #define memory_region_unref memory_region_unref_mips
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_mips
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_mips
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_mips
 #define memory_region_update_container_subregions memory_region_update_container_subregions_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index 4baf241b..155494bd 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_mips64
 #define memory_region_name memory_region_name_mips64
 #define memory_region_need_escape memory_region_need_escape_mips64
-#define memory_region_notify_iommu memory_region_notify_iommu_mips64
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_mips64
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_mips64
 #define memory_region_present memory_region_present_mips64
 #define memory_region_read_accessor memory_region_read_accessor_mips64
 #define memory_region_readd_subregion memory_region_readd_subregion_mips64
 #define memory_region_ref memory_region_ref_mips64
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_mips64
 #define memory_region_resolve_container memory_region_resolve_container_mips64
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_mips64
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_mips64
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_mips64
 #define memory_region_transaction_commit memory_region_transaction_commit_mips64
 #define memory_region_unref memory_region_unref_mips64
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_mips64
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_mips64
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_mips64
 #define memory_region_update_container_subregions memory_region_update_container_subregions_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index 2a17b295..004a8f47 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_mips64el
 #define memory_region_name memory_region_name_mips64el
 #define memory_region_need_escape memory_region_need_escape_mips64el
-#define memory_region_notify_iommu memory_region_notify_iommu_mips64el
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_mips64el
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_mips64el
 #define memory_region_present memory_region_present_mips64el
 #define memory_region_read_accessor memory_region_read_accessor_mips64el
 #define memory_region_readd_subregion memory_region_readd_subregion_mips64el
 #define memory_region_ref memory_region_ref_mips64el
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_mips64el
 #define memory_region_resolve_container memory_region_resolve_container_mips64el
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_mips64el
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_mips64el
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_mips64el
 #define memory_region_transaction_commit memory_region_transaction_commit_mips64el
 #define memory_region_unref memory_region_unref_mips64el
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_mips64el
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_mips64el
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_mips64el
 #define memory_region_update_container_subregions memory_region_update_container_subregions_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index cacecdaa..cb76e4ce 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_mipsel
 #define memory_region_name memory_region_name_mipsel
 #define memory_region_need_escape memory_region_need_escape_mipsel
-#define memory_region_notify_iommu memory_region_notify_iommu_mipsel
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_mipsel
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_mipsel
 #define memory_region_present memory_region_present_mipsel
 #define memory_region_read_accessor memory_region_read_accessor_mipsel
 #define memory_region_readd_subregion memory_region_readd_subregion_mipsel
 #define memory_region_ref memory_region_ref_mipsel
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_mipsel
 #define memory_region_resolve_container memory_region_resolve_container_mipsel
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_mipsel
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_mipsel
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_mipsel
 #define memory_region_transaction_commit memory_region_transaction_commit_mipsel
 #define memory_region_unref memory_region_unref_mipsel
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_mipsel
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_mipsel
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_mipsel
 #define memory_region_update_container_subregions memory_region_update_container_subregions_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index 7ccd86d5..62a8c366 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_powerpc
 #define memory_region_name memory_region_name_powerpc
 #define memory_region_need_escape memory_region_need_escape_powerpc
-#define memory_region_notify_iommu memory_region_notify_iommu_powerpc
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_powerpc
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_powerpc
 #define memory_region_present memory_region_present_powerpc
 #define memory_region_read_accessor memory_region_read_accessor_powerpc
 #define memory_region_readd_subregion memory_region_readd_subregion_powerpc
 #define memory_region_ref memory_region_ref_powerpc
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_powerpc
 #define memory_region_resolve_container memory_region_resolve_container_powerpc
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_powerpc
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_powerpc
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_powerpc
 #define memory_region_transaction_commit memory_region_transaction_commit_powerpc
 #define memory_region_unref memory_region_unref_powerpc
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_powerpc
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_powerpc
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_powerpc
 #define memory_region_update_container_subregions memory_region_update_container_subregions_powerpc
diff --git a/qemu/qemu-timer.c b/qemu/qemu-timer.c
index 2ea304b5..01e17537 100644
--- a/qemu/qemu-timer.c
+++ b/qemu/qemu-timer.c
@@ -47,7 +47,6 @@ typedef struct QEMUClock {
     /* We rely on BQL to protect the timerlists */
     QLIST_HEAD(, QEMUTimerList) timerlists;
 
-    NotifierList reset_notifiers;
     int64_t last;
 
     QEMUClockType type;
diff --git a/qemu/sparc.h b/qemu/sparc.h
index a4fc87af..7259b6ba 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_sparc
 #define memory_region_name memory_region_name_sparc
 #define memory_region_need_escape memory_region_need_escape_sparc
-#define memory_region_notify_iommu memory_region_notify_iommu_sparc
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_sparc
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_sparc
 #define memory_region_present memory_region_present_sparc
 #define memory_region_read_accessor memory_region_read_accessor_sparc
 #define memory_region_readd_subregion memory_region_readd_subregion_sparc
 #define memory_region_ref memory_region_ref_sparc
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_sparc
 #define memory_region_resolve_container memory_region_resolve_container_sparc
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_sparc
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_sparc
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_sparc
 #define memory_region_transaction_commit memory_region_transaction_commit_sparc
 #define memory_region_unref memory_region_unref_sparc
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_sparc
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_sparc
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_sparc
 #define memory_region_update_container_subregions memory_region_update_container_subregions_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index b0e5384c..664d308a 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_sparc64
 #define memory_region_name memory_region_name_sparc64
 #define memory_region_need_escape memory_region_need_escape_sparc64
-#define memory_region_notify_iommu memory_region_notify_iommu_sparc64
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_sparc64
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_sparc64
 #define memory_region_present memory_region_present_sparc64
 #define memory_region_read_accessor memory_region_read_accessor_sparc64
 #define memory_region_readd_subregion memory_region_readd_subregion_sparc64
 #define memory_region_ref memory_region_ref_sparc64
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_sparc64
 #define memory_region_resolve_container memory_region_resolve_container_sparc64
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_sparc64
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_sparc64
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_sparc64
 #define memory_region_transaction_commit memory_region_transaction_commit_sparc64
 #define memory_region_unref memory_region_unref_sparc64
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_sparc64
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_sparc64
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_sparc64
 #define memory_region_update_container_subregions memory_region_update_container_subregions_sparc64
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index 5df15284..a9efa494 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -2061,14 +2061,12 @@
 #define memory_region_is_unassigned memory_region_is_unassigned_x86_64
 #define memory_region_name memory_region_name_x86_64
 #define memory_region_need_escape memory_region_need_escape_x86_64
-#define memory_region_notify_iommu memory_region_notify_iommu_x86_64
 #define memory_region_oldmmio_read_accessor memory_region_oldmmio_read_accessor_x86_64
 #define memory_region_oldmmio_write_accessor memory_region_oldmmio_write_accessor_x86_64
 #define memory_region_present memory_region_present_x86_64
 #define memory_region_read_accessor memory_region_read_accessor_x86_64
 #define memory_region_readd_subregion memory_region_readd_subregion_x86_64
 #define memory_region_ref memory_region_ref_x86_64
-#define memory_region_register_iommu_notifier memory_region_register_iommu_notifier_x86_64
 #define memory_region_resolve_container memory_region_resolve_container_x86_64
 #define memory_region_rom_device_set_romd memory_region_rom_device_set_romd_x86_64
 #define memory_region_section_get_iotlb memory_region_section_get_iotlb_x86_64
@@ -2082,7 +2080,6 @@
 #define memory_region_transaction_begin memory_region_transaction_begin_x86_64
 #define memory_region_transaction_commit memory_region_transaction_commit_x86_64
 #define memory_region_unref memory_region_unref_x86_64
-#define memory_region_unregister_iommu_notifier memory_region_unregister_iommu_notifier_x86_64
 #define memory_region_update_coalesced_range memory_region_update_coalesced_range_x86_64
 #define memory_region_update_coalesced_range_as memory_region_update_coalesced_range_as_x86_64
 #define memory_region_update_container_subregions memory_region_update_container_subregions_x86_64