cpu: make cpu-qom.h only include-able from cpu.h

Make cpu-qom.h so that it is only included from cpu.h.  Then there
is no need for it to include cpu.h again.

Later we will make cpu-qom.h target independent and we will _want_
to include it from elsewhere, but for now reduce the number of cases
to handle.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index b01c6c82eba9ddfc97d2daaa838b519268dc38ed..cf5264a94fd734e75737f53682e774b46427e43a 100644 (file)
--- a/target-alpha/cpu-qom.h
+++ b/target-alpha/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_ALPHA_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #define TYPE_ALPHA_CPU "alpha-cpu"
 

diff --git a/target-arm/psci.c b/target-arm/psci.c
index ce2e0dca39432b8a06e65bfab734cdcc003fbb40..071bbb45db16695f4041d9eb1c6539672f2a6b73 100644 (file)
--- a/target-arm/psci.c
+++ b/target-arm/psci.c
@@ -17,7 +17,6 @@
  */
 #include "qemu/osdep.h"
 #include <cpu.h>
-#include <cpu-qom.h>
 #include <exec/helper-proto.h>
 #include <kvm-consts.h>
 #include <sysemu/sysemu.h>

diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index cb750176c0c0b360b43b6af6da43db2d77428de3..2ca7b9ed99f55023322fa31cf99d9fc673bbecbd 100644 (file)
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_I386_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 #include "qemu/notify.h"
 
 #ifdef TARGET_X86_64

diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h
index 77bc7b2686769e76e067735536f577be3208a8f9..54989e4e158568b3f3729ea8b59a0bf78f8c0d65 100644 (file)
--- a/target-lm32/cpu-qom.h
+++ b/target-lm32/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_LM32_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #define TYPE_LM32_CPU "lm32-cpu"
 

diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
index 7d5e2b36a997c1620d831385ad99b60c1247e8df..eb822a3c3d9e9954828c62b652ecf5035038b500 100644 (file)
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_PPC_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #ifdef TARGET_PPC64
 #define TYPE_POWERPC_CPU "powerpc64-cpu"

diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h
index 1c909339659eb2013f05291682f8d0bf0b4a470f..681e370dc15f90e2363a24f294fc12a6119adc16 100644 (file)
--- a/target-s390x/cpu-qom.h
+++ b/target-s390x/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_S390_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #define TYPE_S390_CPU "s390-cpu"
 

diff --git a/target-sparc/cpu-qom.h b/target-sparc/cpu-qom.h
index 5096b104725837748d052e6af1953dd732808597..174dfd30c1433d5ec4363679179349c6000c6705 100644 (file)
--- a/target-sparc/cpu-qom.h
+++ b/target-sparc/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_SPARC_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #ifdef TARGET_SPARC64
 #define TYPE_SPARC_CPU "sparc64-cpu"

diff --git a/target-unicore32/cpu-qom.h b/target-unicore32/cpu-qom.h
index ea65b83318df91ac18110f6607462cb4b1043628..e554f1f47b98747ee3899ae39258efe4aaa02ec4 100644 (file)
--- a/target-unicore32/cpu-qom.h
+++ b/target-unicore32/cpu-qom.h
@@ -12,7 +12,6 @@
 #define QEMU_UC32_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #define TYPE_UNICORE32_CPU "unicore32-cpu"
 

diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h
index 2258224d09a08bc698ea0afc39d239e1a15da2a0..f5d9b9f72782bdba8401868b7175a11c443b87ba 100644 (file)
--- a/target-xtensa/cpu-qom.h
+++ b/target-xtensa/cpu-qom.h
@@ -30,7 +30,6 @@
 #define QEMU_XTENSA_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #define TYPE_XTENSA_CPU "xtensa-cpu"