From patchwork Fri Jun 25 12:52:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 56970 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 4E060B6EEF for ; Sat, 26 Jun 2010 05:17:26 +1000 (EST) Received: from localhost ([127.0.0.1]:39159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSEOw-0004gP-IB for incoming@patchwork.ozlabs.org; Fri, 25 Jun 2010 15:17:22 -0400 Received: from [140.186.70.92] (port=54085 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSD2G-0004OQ-AT for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:50:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OS8Ot-0002hQ-JG for qemu-devel@nongnu.org; Fri, 25 Jun 2010 08:52:57 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:50953) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OS8Ot-0002es-FH for qemu-devel@nongnu.org; Fri, 25 Jun 2010 08:52:55 -0400 Received: by mail-wy0-f173.google.com with SMTP id 42so3384263wyb.4 for ; Fri, 25 Jun 2010 05:52:45 -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:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=qbnLCHcWnpGcUGWk5lBh2o5EmyNwTmrkJKDJG38D9mM=; b=IB128t304R/J3XB92isRLsmaqEzncuHDUEskU7IcXwZTRbJYTmlgCfsUJlH37nR1GM 0VcyFvDuTA3Xxd4kKUR9r3vd5+bLfhLp9gxnD1ZVCunZ5QDJFBMXnVnXq+Ji8N9or0/O noXU2gK5SlFKNBfhCrniL/YalE+Q10/NCbpKk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=dd5O0TSdxn5trqB7J5DyWmobJPSuZC6oPuObKrEXFV7gZ39cPA+OniYBtX4T1Pvrzp aMkXVobc6WN4Ocoy6pdGKOA8ai2dMskywqnlOk5ncI14IGvWs0QDOZD1HXh3BWbOEnvl nqCO0vryA1/28fJaty7Niurudene73jPxGwDo= Received: by 10.216.165.75 with SMTP id d53mr505695wel.76.1277470365631; Fri, 25 Jun 2010 05:52:45 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id o3sm116954wee.38.2010.06.25.05.52.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 25 Jun 2010 05:52:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jun 2010 14:52:22 +0200 Message-Id: <1277470342-5861-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1277470342-5861-1-git-send-email-pbonzini@redhat.com> References: <1277470342-5861-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Amit Shah , Isaku Yamahata Subject: [Qemu-devel] [PATCH 7/7] poison TARGET_xxx for compile once object 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 prevents those ifdefs from creeping in again. Cc: Isaku Yamahata Signed-off-by: Paolo Bonzini --- cpu-common.h | 4 ---- qemu-common.h | 5 +---- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/cpu-common.h b/cpu-common.h index d905258..639c58d 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -11,10 +11,6 @@ #include "targphys.h" #endif -#ifndef NEED_CPU_H -#include "poison.h" -#endif - #include "bswap.h" #include "qemu-queue.h" diff --git a/qemu-common.h b/qemu-common.h index 8339cb1..423639b 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -86,15 +86,12 @@ static inline char *realpath(const char *path, char *resolved_path) /* FIXME: Remove NEED_CPU_H. */ #ifndef NEED_CPU_H - #include #include "osdep.h" #include "bswap.h" - +#include "poison.h" #else - #include "cpu.h" - #endif /* !defined(NEED_CPU_H) */ /* bottom halves */