From patchwork Wed Mar 31 15:25:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 49158 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 BAA63B6ED0 for ; Thu, 1 Apr 2010 02:35:39 +1100 (EST) Received: from localhost ([127.0.0.1]:59844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwzx9-0006FY-Nq for incoming@patchwork.ozlabs.org; Wed, 31 Mar 2010 11:35:35 -0400 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) 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=KPa2JGXhg4rRn9v3j9q3cmXKzWBY9pA6xSMJhI4DBJ5Q1eObyJ/YPYNJT4EiX2jPEW pITibli6CPxsFfwN0TvUUhyaH76KI/gGBbZpBJrPFVGG9V7EnePuelN66c5ROcf42/vo kXZ/7Yyhhpwsn45+WHzbX3wAyu7Ux11EDh04U= 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=tJ8swWONwJrh2R7FVPsclKp9XBCAFwDg2W9/RNSuovz6fHec8eOx4RSTm3ol6eRXn3 /5i7VttW4/vfuod8Lt3WHEzLLdR7DrfGauNmEMzhPbMvpCfT5J4A/SdegVgZgdVYAqkV c6ZJg15PbrK41WJT8jFHjl7rRV2OLlJVp5iqE= Received: by 10.204.45.207 with SMTP id g15mr2156531bkf.210.1270049166173; Wed, 31 Mar 2010 08:26:06 -0700 (PDT) Received: from localhost.localdomain (93-34-197-68.ip51.fastwebnet.it [93.34.197.68]) by mx.google.com with ESMTPS id 16sm3496084bwz.13.2010.03.31.08.26.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 31 Mar 2010 08:26:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 31 Mar 2010 17:25:56 +0200 Message-Id: <1270049157-29784-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> References: <1270047363-12627-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 4/3] 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