From patchwork Thu Jan 28 20:37:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 8153821 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0C325BEEE5 for ; Thu, 28 Jan 2016 20:37:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7906220221 for ; Thu, 28 Jan 2016 20:37:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A42902021B for ; Thu, 28 Jan 2016 20:37:17 +0000 (UTC) Received: from localhost ([::1]:58490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtJc-0001Ki-VC for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jan 2016 15:37:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtJV-0001Kb-Ff for qemu-devel@nongnu.org; Thu, 28 Jan 2016 15:37:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOtJS-0006y8-Gs for qemu-devel@nongnu.org; Thu, 28 Jan 2016 15:37:09 -0500 Received: from roura.ac.upc.edu ([147.83.33.10]:50947 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtJS-0006xn-2v for qemu-devel@nongnu.org; Thu, 28 Jan 2016 15:37:06 -0500 Received: from gw-3.ac.upc.es (gw-3.ac.upc.es [147.83.30.9]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u0SKb4Nq018370; Thu, 28 Jan 2016 21:37:04 +0100 Received: from localhost (unknown [84.88.51.85]) by gw-3.ac.upc.es (Postfix) with ESMTPSA id 8126416D; Thu, 28 Jan 2016 21:37:04 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Thu, 28 Jan 2016 21:37:04 +0100 Message-Id: <145401342418.13355.6815605327627520518.stgit@localhost> X-Mailer: git-send-email 2.7.0.rc3 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id u0SKb4Nq018370 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Cc: Paolo Bonzini , Richard Henderson , Peter Crosthwaite Subject: [Qemu-devel] [PATCH] build: Fix double-definition when using LTTng tracing 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In linux-user builds, the LTTng backend pulls "syscall.h", which resets defines in "errno_defs.h", while "qemu.h" pulls "errno_defs.h" after "syscall.h" has been included. Signed-off-by: Lluís Vilanova --- translate-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translate-all.c b/translate-all.c index 042a857..88d3e7d 100644 --- a/translate-all.c +++ b/translate-all.c @@ -33,7 +33,6 @@ #include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" -#include "trace.h" #include "disas/disas.h" #include "tcg.h" #if defined(CONFIG_USER_ONLY) @@ -56,6 +55,7 @@ #else #include "exec/address-spaces.h" #endif +#include "trace.h" #include "exec/cputlb.h" #include "exec/tb-hash.h"