From 35bed8ee918b519caca37f99f741b2740a040da3 Mon Sep 17 00:00:00 2001
From: Paul Brook <paul@codesourcery.com>
Date: Mon, 1 Mar 2010 03:29:21 +0000
Subject: [PATCH] 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>
---
 cpu-all.h               | 3 ---
 hw/pc.h                 | 1 +
 target-i386/kvm.c       | 1 +
 target-i386/op_helper.c | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpu-all.h b/cpu-all.h
index 1ccc9a87b7..8488bfea9f 100644
--- 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 92f8563609..d54959aa59 100644
--- 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 6b741ba489..d2116a7b3f 100644
--- 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 4bb434708c..22259dfcd7 100644
--- 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
 
-- 
2.11.4.GIT