[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/52] cpu: make cpu-qom.h only include-able from cpu
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/52] cpu: make cpu-qom.h only include-able from cpu.h |
Date: |
Thu, 19 May 2016 13:17:59 +0200 |
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-alpha/cpu-qom.h | 1 -
target-arm/psci.c | 1 -
target-i386/cpu-qom.h | 1 -
target-lm32/cpu-qom.h | 1 -
target-ppc/cpu-qom.h | 1 -
target-s390x/cpu-qom.h | 1 -
target-sparc/cpu-qom.h | 1 -
target-unicore32/cpu-qom.h | 1 -
target-xtensa/cpu-qom.h | 1 -
9 files changed, 9 deletions(-)
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index b01c6c8..cf5264a 100644
--- 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 ce2e0dc..071bbb4 100644
--- 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 cb75017..2ca7b9e 100644
--- 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 77bc7b2..54989e4 100644
--- 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 7d5e2b3..eb822a3 100644
--- 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 1c90933..681e370 100644
--- 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 5096b10..174dfd3 100644
--- 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 ea65b83..e554f1f 100644
--- 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 2258224..f5d9b9f 100644
--- 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"
--
1.8.3.1
- [Qemu-devel] [PULL 00/52] NEED_CPU_H cleanups, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 04/52] log: do not use CONFIG_USER_ONLY, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 05/52] cpu: make cpu-qom.h only include-able from cpu.h,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/52] target-cris: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 06/52] target-alpha: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 03/52] include: move CPU-related definitions out of qemu-common.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 07/52] target-arm: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 02/52] s390x: move .needed functions for subsections to machine.c, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 13/52] target-mips: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 01/52] scripts: add script to build QEMU and analyze inclusions, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 09/52] target-i386: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 14/52] target-ppc: do not use target_ulong in cpu-qom.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 18/52] target-sh4: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19