[PATCH 01/28] include: move qemu_irq_handler out of typedefs.h

[Paolo Bonzini <pbonzini@redhat.com>]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/hw/irq.h        | 2 ++
 include/hw/qdev-core.h  | 1 +
 include/qemu/typedefs.h | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/hw/irq.h b/include/hw/irq.h
index 291fdd67df4..81b81ed493c 100644
--- a/include/hw/irq.h
+++ b/include/hw/irq.h
@@ -8,6 +8,8 @@
 #define TYPE_IRQ "irq"
 OBJECT_DECLARE_SIMPLE_TYPE(IRQState, IRQ)
 
+typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
+
 struct IRQState {
     Object parent_obj;
 
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 2caa0cbd26f..9802b6896de 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -8,6 +8,7 @@
 #include "qemu/rcu_queue.h"
 #include "qom/object.h"
 #include "hw/hotplug.h"
+#include "hw/irq.h"
 #include "hw/resettable.h"
 
 /**
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 4a94af9665a..cf931ff549c 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -132,7 +132,6 @@ typedef struct IRQState *qemu_irq;
 /*
  * Function types
  */
-typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
 typedef bool (*MigrationLoadThread)(void *opaque, bool *should_quit,
                                     Error **errp);
 typedef bool (*SaveCompletePrecopyThreadHandler)(SaveCompletePrecopyThreadData *d,
-- 
2.51.1