[Qemu-devel] [PATCH RFC v2 4/5] include: Move typedef qemu_irq to qemu/typedefs.h

[Markus Armbruster <armbru@redhat.com>]

While there, drop a comment that has become misleading.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/hw/irq.h          | 2 --
 include/hw/isa/vt82c686.h | 2 --
 include/hw/mips/mips.h    | 2 --
 include/qemu/typedefs.h   | 4 +---
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/hw/irq.h b/include/hw/irq.h
index 4c4c2ea..6a89571 100644
--- a/include/hw/irq.h
+++ b/include/hw/irq.h
@@ -5,8 +5,6 @@
 
 #define TYPE_IRQ "irq"
 
-typedef struct IRQState *qemu_irq;
-
 typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
 
 void qemu_set_irq(qemu_irq irq, int level);
diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h
index ddc8405..471b5e9 100644
--- a/include/hw/isa/vt82c686.h
+++ b/include/hw/isa/vt82c686.h
@@ -1,5 +1,3 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_VT82C686_H
 #define HW_VT82C686_H
 
diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h
index 8f5608b..e0065ce 100644
--- a/include/hw/mips/mips.h
+++ b/include/hw/mips/mips.h
@@ -1,5 +1,3 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_MIPS_H
 #define HW_MIPS_H
 /* Definitions for mips board emulation.  */
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index b113fcf..8482783 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -1,9 +1,6 @@
 #ifndef QEMU_TYPEDEFS_H
 #define QEMU_TYPEDEFS_H
 
-/* A load of opaque types so that device init declarations don't have to
-   pull in all the real definitions.  */
-
 /* Please keep this list in alphabetical order */
 typedef struct AdapterInfo AdapterInfo;
 typedef struct AddressSpace AddressSpace;
@@ -34,6 +31,7 @@ typedef struct FWCfgState FWCfgState;
 typedef struct HCIInfo HCIInfo;
 typedef struct I2CBus I2CBus;
 typedef struct I2SCodec I2SCodec;
+typedef struct IRQState *qemu_irq;
 typedef struct ISABus ISABus;
 typedef struct ISADevice ISADevice;
 typedef struct IsaDma IsaDma;
-- 
2.5.5