From patchwork Tue Jul 16 17:44:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18383 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f199.google.com (mail-gg0-f199.google.com [209.85.161.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DF36325E5C for ; Tue, 16 Jul 2013 17:45:08 +0000 (UTC) Received: by mail-gg0-f199.google.com with SMTP id o1sf1012450ggn.2 for ; Tue, 16 Jul 2013 10:45:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=U/Ow7KaCxdsjhYGMqzwEJbYKObaU3H+GPEuQXaujNDc=; b=j9LdIwrMME5U2lQD6HZw1x746JcDgjHN03BZeSlvjjrmg1nd0XIZrLYT5LsOe7NPTx z5/9nThFgi4aSA+Pp0/W3CaSRLo6V2zmt7J/4Cvr/CgrQ8+hYP8sWtsbHhf0+erfKG9F a5ScI52DgkK5QrTNTC+vUQMDA8D4jGSZ98rQNUPyv6sUbaI+lBugmKFdU2jshfUPPclL 0DYjzqbEN7IPy0Ix9rugpjhCY+JMIip1vDrQhOvc1Jz95W1nqi3nNGiYreMMVqUJ+gd9 fx/4A2v42JHuSUFe+mzHDNptXAC4ZCSYgKpPl9WTUxbhkCNitfZtMafeC3JxGZbQ5UYF UfoQ== X-Received: by 10.236.79.67 with SMTP id h43mr1275196yhe.46.1373996708570; Tue, 16 Jul 2013 10:45:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.84 with SMTP id da20ls287822qeb.46.gmail; Tue, 16 Jul 2013 10:45:08 -0700 (PDT) X-Received: by 10.52.67.84 with SMTP id l20mr664349vdt.24.1373996708444; Tue, 16 Jul 2013 10:45:08 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id b5si456890vcl.70.2013.07.16.10.45.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Jul 2013 10:45:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id gd11so676481vcb.16 for ; Tue, 16 Jul 2013 10:45:08 -0700 (PDT) X-Received: by 10.220.164.138 with SMTP id e10mr795888vcy.27.1373996708208; Tue, 16 Jul 2013 10:45:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.149.77 with SMTP id s13csp131941vcv; Tue, 16 Jul 2013 10:45:07 -0700 (PDT) X-Received: by 10.14.119.136 with SMTP id n8mr2727900eeh.1.1373996705656; Tue, 16 Jul 2013 10:45:05 -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 e5si2243797eeg.252.2013.07.16.10.45.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 16 Jul 2013 10:45:05 -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; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Uz9J7-0007d9-9y; Tue, 16 Jul 2013 18:45:01 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio , Richard Henderson , Aurelien Jarno , Alexander Graf , Blue Swirl , Guan Xuetao , "Edgar E. Iglesias" , Jia Liu , Laurent Vivier Subject: [PATCH v3 05/13] linux-user: Move includes of target-specific headers to end of qemu.h Date: Tue, 16 Jul 2013 18:44:52 +0100 Message-Id: <1373996700-29286-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1373996700-29286-1-git-send-email-peter.maydell@linaro.org> References: <1373996700-29286-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQlE3MMsaOlPR4cAWw0vrD23Jrw46x9Vsz1dyB/iJXod1JO6e5gnfQzkIeLYKn/morTm2as5 X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The target-specific headers (target_cpu.h and target_signal.h) might need to use the target-independent structure and function definitions of qemu.h; so include them only at the bottom of qemu.h, not the top. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- linux-user/qemu.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 6569608..8c420da 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -16,8 +16,6 @@ #include "exec/user/thunk.h" #include "syscall_defs.h" #include "syscall.h" -#include "target_cpu.h" -#include "target_signal.h" #include "exec/gdbstub.h" #include "qemu/queue.h" @@ -454,4 +452,11 @@ static inline void *lock_user_string(abi_ulong guest_addr) #include #endif +/* Include target-specific struct and function definitions; + * they may need access to the target-independent structures + * above, so include them last. + */ +#include "target_cpu.h" +#include "target_signal.h" + #endif /* QEMU_H */