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: 258791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C2942C0363 for ; Sat, 13 Jul 2013 06:24:52 +1000 (EST) Received: from localhost ([::1]:43831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxjtZ-0006Sl-Bp for incoming@patchwork.ozlabs.org; Fri, 12 Jul 2013 16:24:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uxjt3-0006Sb-Op for qemu-devel@nongnu.org; Fri, 12 Jul 2013 16:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uxjt1-0003VS-5I for qemu-devel@nongnu.org; Fri, 12 Jul 2013 16:24:17 -0400 Received: from 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]:58521 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uxjt0-0003VD-Uv for qemu-devel@nongnu.org; Fri, 12 Jul 2013 16:24:15 -0400 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 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-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Jia Liu , patches@linaro.org, Riku Voipio , Alexander Graf , Blue Swirl , Paul Brook , Guan Xuetao , Aurelien Jarno Subject: [Qemu-devel] [PATCH 5/8] linux-user: Move includes of target-specific headers to end of qemu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 */