From patchwork Fri Jul 12 20:12:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18340 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f198.google.com (mail-gh0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1117625E46 for ; Fri, 12 Jul 2013 20:13:06 +0000 (UTC) Received: by mail-gh0-f198.google.com with SMTP id r13sf10705925ghr.5 for ; Fri, 12 Jul 2013 13:13:05 -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=I1HhJBz/wu2nZNQukXoTqFfzSopbBe1gvN3csOu0tSI=; b=C62F1GBlMlF+j9OugxVl06difbLjHBdYGWGxyQLvcMK6BCaNzlf34YJhrLFe/Pr2DE C7U7/fGtnsiJ3zKClkiDPLFWFyuPbuXxcQI6as9K6MuMAMEvBV+JM8ElE0fVbUQnz9Nu 0n7K0/itd1TLh3XHSSVfoDe7c2aZiantJMKcqzKCd1h9uPZLP3bdAr/gEYfRnEiMrYqc Y4+g5+rfo3jgbNp4Q/6M5bI8GWJquvhWZq4GMAV8OrVzQ90/4nDCze2yZIqgP3qhXR8C D919ceqsbvzD+jYOUJWEoTj0JkLQ0u9LH3rxEXpELQLEnaq5sA8DJwXDL1k/12z8dCxW oh3A== X-Received: by 10.236.38.106 with SMTP id z70mr22661914yha.29.1373659985726; Fri, 12 Jul 2013 13:13:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.15.131 with SMTP id x3ls3527575qec.76.gmail; Fri, 12 Jul 2013 13:13:05 -0700 (PDT) X-Received: by 10.52.93.34 with SMTP id cr2mr3800231vdb.69.1373659985599; Fri, 12 Jul 2013 13:13:05 -0700 (PDT) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id ia10si12645096vdb.155.2013.07.12.13.13.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Jul 2013 13:13:05 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id e12so1870894vbg.2 for ; Fri, 12 Jul 2013 13:13:05 -0700 (PDT) X-Received: by 10.58.154.34 with SMTP id vl2mr19613690veb.35.1373659985524; Fri, 12 Jul 2013 13:13:05 -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 s13csp147065vcv; Fri, 12 Jul 2013 13:13:04 -0700 (PDT) X-Received: by 10.152.29.227 with SMTP id n3mr20133468lah.43.1373659979573; Fri, 12 Jul 2013 13:12:59 -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 a3si3566590lak.74.2013.07.12.13.12.58 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Jul 2013 13:12:59 -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 1Uxji1-00064Q-Re; Fri, 12 Jul 2013 21:12:53 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paul Brook , Aurelien Jarno , Jia Liu , Alexander Graf , Blue Swirl , Guan Xuetao , Riku Voipio Subject: [PATCH 5/8] linux-user: Move includes of target-specific headers to end of qemu.h Date: Fri, 12 Jul 2013 21:12:50 +0100 Message-Id: <1373659973-23289-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1373659973-23289-1-git-send-email-peter.maydell@linaro.org> References: <1373659973-23289-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQno+DNMucFAWc8xsphcUyZZjtkU0fL8ZnHKoFd4LsLHCcNeyliKtygRKK2b+jh3BpnqyspQ X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 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 */