From patchwork Fri Oct 12 17:59:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12191 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DDFCC23FB3 for ; Fri, 12 Oct 2012 17:59:52 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 77B52A18710 for ; Fri, 12 Oct 2012 17:59:52 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so5067802iej.11 for ; Fri, 12 Oct 2012 10:59:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=KOuPW63LpiyloFAkJQp6tHexj5d76xF7qJM2jczMKnU=; b=ebtlyVnZHxE0x+FDIKQ8pSOV6bdmNS2RWIv4FjT2Zp8u4I4pe06QGjv7sh6Q0S0EpX 3/hCD6irJ9ptcTGBrurJcs8aJV/qakwmXXkoJzdQjbn4LkGVQGuOq+njSj0OzsnyF4A6 Kw9orhrVR3nY9gen0ds+0/yajOd1sTzsXKRPqGptW7/lDuPIDe4q/wDmSUhNXNChMaLY GcZa1uAmIq6/pwzmzcjUjxYEUjQr1fhKPu/960cfn0nFRSNAJ4IKVjEm8rWRNUJHx6qv say1EdwjfrpmxVDfQZFlSI+lQy+VUn5UsuN0PIGOw+UPMiBEEVZ7BuDtbz9ECJX4PQZQ +YBw== Received: by 10.50.91.195 with SMTP id cg3mr2908571igb.57.1350064791946; Fri, 12 Oct 2012 10:59:51 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp231818igt; Fri, 12 Oct 2012 10:59:50 -0700 (PDT) Received: by 10.216.44.3 with SMTP id m3mr3224467web.129.1350064790001; Fri, 12 Oct 2012 10:59:50 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id ex5si5475077wib.10.2012.10.12.10.59.49 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 10:59:49 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TMjWS-0003P3-H3; Fri, 12 Oct 2012 18:59:44 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: Avi Kivity , qemu-trivial@nongnu.org, patches@linaro.org, Riku Voipio Subject: [PATCH] targphys.h: Don't define target_phys_addr_t for user-mode emulators Date: Fri, 12 Oct 2012 18:59:44 +0100 Message-Id: <1350064784-13058-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQmmy6wQC86RBC5mW9e3qa1s72ZQIKMICSrWOfuF54ZqtnXrHH9jEN2u9oIVFQPJpwtGO/bq Commit 4be403c accidentally defined the target_phys_addr_t type when building user-mode emulators. Since the type doesn't really make any sense except for system emulators, avoid defining it when building in user mode. Signed-off-by: Peter Maydell Acked-by: Andreas Färber --- cf brief discussion earlier: http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg01138.html targphys.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targphys.h b/targphys.h index 08cade9..50911fd 100644 --- a/targphys.h +++ b/targphys.h @@ -3,6 +3,8 @@ #ifndef TARGPHYS_H #define TARGPHYS_H +#ifndef CONFIG_USER_ONLY + #define TARGET_PHYS_ADDR_BITS 64 /* target_phys_addr_t is the type of a physical address (its size can be different from 'target_ulong'). */ @@ -18,3 +20,5 @@ typedef uint64_t target_phys_addr_t; #define TARGET_PRIXPHYS PRIX64 #endif + +#endif