From patchwork Thu Apr 1 17:57:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 49230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49B4FB7D0C for ; Fri, 2 Apr 2010 05:03:12 +1100 (EST) Received: from localhost ([127.0.0.1]:55909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxOjV-0004yI-HU for incoming@patchwork.ozlabs.org; Thu, 01 Apr 2010 14:03:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxOe9-0003rq-HT for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:37 -0400 Received: from [140.186.70.92] (port=59654 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxOe7-0003r8-La for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxOe4-0004zN-Ju for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:35 -0400 Received: from mail-iw0-f196.google.com ([209.85.223.196]:40637) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxOe4-0004zH-FQ for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:32 -0400 Received: by iwn34 with SMTP id 34so947378iwn.23 for ; Thu, 01 Apr 2010 10:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=GLLi+MCioM42kTPo5YQQo/X6b/rc/3f3fnEq7Nou8c4=; b=au6IFUu6fG5k0bLdcGM2EeUXfKt+kAt420ztTyVPcVwjIAokyuK1d4nANyfbOO/cV8 xx9l01OwMGZfY6fc0mEcJmxGtYP9ZBLmidT4zzlhxIjyeN5MxQc/OwZ3lJdPGxJrBb4G 4bSB/8zcxhflKAZYUf4qMVKzHO36NOPwE6GPg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=j9ljAgHDW0MPo/jCbenRAbAbnrMYdPCLtbGirEnjj9SvCbPwLModLZqCLSF1KFdrOe z28eAE/K/UHiBkhAMCJo9UQf+SvkMTNZLVhf1VDoc4ZBG3N0agd9kMYJR4O2KebvLqHT BjP1PQYFyyWyWai4vOlNul8fxTDAkl44kxyI4= Received: by 10.231.150.2 with SMTP id w2mr297405ibv.90.1270144651460; Thu, 01 Apr 2010 10:57:31 -0700 (PDT) Received: from localhost.localdomain (93-34-197-68.ip51.fastwebnet.it [93.34.197.68]) by mx.google.com with ESMTPS id c21sm8510833ibr.22.2010.04.01.10.57.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Apr 2010 10:57:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 1 Apr 2010 19:57:10 +0200 Message-Id: <1270144632-25063-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1270144632-25063-1-git-send-email-pbonzini@redhat.com> References: <1270144632-25063-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 3/5] move targphys.h and hw/poison.h inclusion to cpu-common.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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/hw/poison.h b/poison.h similarity index 100% rename from hw/poison.h rename to poison.h 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