From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nwzo3-00072J-QZ for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:11 -0400 Received: from [140.186.70.92] (port=45911 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwzo2-00070q-AO for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nwznz-0003hX-NR for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:09 -0400 Received: from mail-bw0-f218.google.com ([209.85.218.218]:60099) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nwznz-0003hE-IC for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:07 -0400 Received: by bwz10 with SMTP id 10so273516bwz.2 for ; Wed, 31 Mar 2010 08:26:06 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 31 Mar 2010 17:25:56 +0200 Message-Id: <1270049157-29784-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> References: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/3] move targphys.h and hw/poison.h inclusion to cpu-common.h List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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