[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/3] move targphys.h and hw/poison.h inclusion to cp
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 4/3] move targphys.h and hw/poison.h inclusion to cpu-common.h |
Date: |
Wed, 31 Mar 2010 17:25:56 +0200 |
With more files from outside the hw/ directory being placed into
libhw, avoid the need to include hw/hw.h for the sake of targ_phys_addr_t.
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpu-common.h | 8 ++++++++
hw/hw.h | 2 --
hw/poison.h => poison.h | 0
3 files changed, 8 insertions(+), 2 deletions(-)
rename hw/poison.h => poison.h (100%)
diff --git a/cpu-common.h b/cpu-common.h
index bb05300..2abd4a8 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -7,6 +7,14 @@
#define WORDS_ALIGNED
#endif
+#ifdef TARGET_PHYS_ADDR_BITS
+#include "targphys.h"
+#endif
+
+#ifndef NEED_CPU_H
+#include "poison.h"
+#endif
+
#include "bswap.h"
#include "qemu-queue.h"
diff --git a/hw/hw.h b/hw/hw.h
index 7b500f4..328b704 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -5,8 +5,6 @@
#include "qemu-common.h"
#if defined(TARGET_PHYS_ADDR_BITS) && !defined(NEED_CPU_H)
-#include "targphys.h"
-#include "poison.h"
#include "cpu-common.h"
#endif
diff --git a/hw/poison.h b/poison.h
similarity index 100%
rename from hw/poison.h
rename to poison.h
--
1.6.6.1