Move ioport.h out of cpu-all.h

Only include ioport.h where it is actually needed.

Signed-off-by: Paul Brook <paul@codesourcery.com>

diff --git a/cpu-all.h b/cpu-all.h
index 1ccc9a8..8488bfe 100644 (file)
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -840,9 +840,6 @@ void cpu_set_log(int log_flags);
 void cpu_set_log_filename(const char *filename);
 int cpu_str_to_log_mask(const char *str);
 
-/* IO ports API */
-#include "ioport.h"
-
 /* memory API */
 
 extern int phys_ram_fd;

diff --git a/hw/pc.h b/hw/pc.h
index 92f8563..d54959a 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -2,6 +2,7 @@
 #define HW_PC_H
 
 #include "qemu-common.h"
+#include "ioport.h"
 
 /* PC-style peripherals (also used by other machines).  */
 

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 6b741ba..d2116a7 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -25,6 +25,7 @@
 #include "gdbstub.h"
 #include "host-utils.h"
 #include "hw/pc.h"
+#include "ioport.h"
 
 #ifdef CONFIG_KVM_PARA
 #include <linux/kvm_para.h>

diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index 4bb4347..22259df 100644 (file)
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -20,6 +20,7 @@
 #include "exec.h"
 #include "exec-all.h"
 #include "host-utils.h"
+#include "ioport.h"
 
 //#define DEBUG_PCALL