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

[Markus Armbruster <armbru@redhat.com>]

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/hw/irq.h        | 2 --
 include/qemu/typedefs.h | 1 +
 tests/Makefile.include  | 2 --
 3 files changed, 1 insertion(+), 4 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/qemu/typedefs.h b/include/qemu/typedefs.h
index f9745c4..f7c27a9 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -31,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;
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e20f437..cd2082a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -543,11 +543,9 @@ blacklisted-headers :=					\
 	include/hw/input/hid.h				\
 	include/hw/intc/allwinner-a10-pic.h		\
 	include/hw/isa/i8257.h				\
-	include/hw/isa/vt82c686.h			\
 	include/hw/kvm/clock.h				\
 	include/hw/mips/bios.h				\
 	include/hw/mips/cpudevs.h			\
-	include/hw/mips/mips.h				\
 	include/hw/misc/mips_cmgcr.h			\
 	include/hw/misc/mips_cpc.h			\
 	include/hw/misc/mips_itu.h			\
-- 
2.5.5