From patchwork Fri May 20 11:57:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9129333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B04760762 for ; Fri, 20 May 2016 11:58:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D24C1FFC9 for ; Fri, 20 May 2016 11:58:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01A7527BF0; Fri, 20 May 2016 11:58:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 880C61FFC9 for ; Fri, 20 May 2016 11:58:06 +0000 (UTC) Received: from localhost ([::1]:54563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3j47-0008L3-RA for patchwork-qemu-devel@patchwork.kernel.org; Fri, 20 May 2016 07:58:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3j3j-0008J2-F2 for qemu-devel@nongnu.org; Fri, 20 May 2016 07:57:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3j3g-0002uH-6s for qemu-devel@nongnu.org; Fri, 20 May 2016 07:57:39 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3j3f-0002ti-W9 for qemu-devel@nongnu.org; Fri, 20 May 2016 07:57:36 -0400 Received: by mail-wm0-x241.google.com with SMTP id n129so28607422wmn.1 for ; Fri, 20 May 2016 04:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=jsK3Ozy6eScB8+wswK1sKqkLGphzB0gIDptzVU/GfMQ=; b=CJI/IcjgiL5ytGQE85X8LJhH9WJR9bcqPDjGOJS7Ev09I4wJM1QpXC6YnNzuMHV/zq K2CZgtln/unkvnDo6VYwHLB2dloklzyMdEY3tBTMpZH/ICV824djjh6VAjGaDyJiI600 6AyGXACN4ox43alpZweAVEWgRG0Ibtb6TeEDuJKq5W/Aa4OF8lLouJaL4GJ4CAcnsd0t m7OUy9XYN/Oj3KMNNA6f9dS//Y9Z8eATE3y8aUBXcXIYWTG2sDT2Limg0AzZHjx8+TbY SXYtB8j3bXvElYAjQg2wL2SmJo7mheBeU7TctvTPljU8fReM4x42TZfbtOcnQzFgefQh 62/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=jsK3Ozy6eScB8+wswK1sKqkLGphzB0gIDptzVU/GfMQ=; b=XTd9gHNy5/UAkhV1n4XtocRWWaoKpVKHeO09HnRHf7kaVhTMhVI5URmsRJD1jqKgFd UKpUsHzR+AriFyAblhJ6XE/MTRQvBKVru0Wic7JoNxfd4oo21sn7/ZAFZjTyQxuT+BV2 fcGclgcH8v9FuYfWko6++oKOEK+ApeTKfLJjQ9oiAYa+tXparzw/HiZSNacH1pCeDAnS CUc74bMGlq1IDNOPWFamvEliKrxRW6bL36djab00/LAjaOSWq0sL5zSw2QHfXdk1ksz6 IRDPVLEnMdqFGuIew3ZMiOPkkFQo6XgodmRsyLPMVqDVhprZSpwM43kWYoH1oaGxfG98 GEcQ== X-Gm-Message-State: AOPr4FViwMIvu5V0Pbw3Bb2op720HiIV0e6wVpVxFp2F328UeNMdaM936wNn6zaJ0y6mNw== X-Received: by 10.194.108.197 with SMTP id hm5mr2957949wjb.167.1463745455166; Fri, 20 May 2016 04:57:35 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id f188sm4274823wma.2.2016.05.20.04.57.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 May 2016 04:57:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 20 May 2016 13:57:31 +0200 Message-Id: <1463745452-25831-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH] tci: do not include exec/exec-all.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP TCI does not need the runtime definition in exec-all.h. It only needs the host-side definitions in tcg/tcg.h. Now that cpu.h is not included everywhere, this caused a failure because exec-all.h does need cpu.h but does not include it itself. Fix by including the intended header. Signed-off-by: Paolo Bonzini --- disas/tci.c | 1 - tci.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/disas/tci.c b/disas/tci.c index 7233343..1cdf5ee 100644 --- a/disas/tci.c +++ b/disas/tci.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "disas/bfd.h" -#include "exec/exec-all.h" #include "tcg/tcg.h" /* Disassemble TCI bytecode. */ diff --git a/tci.c b/tci.c index 0fdc4e2..b488c0d 100644 --- a/tci.c +++ b/tci.c @@ -28,7 +28,7 @@ #endif #include "qemu-common.h" -#include "exec/exec-all.h" /* MAX_OPC_PARAM_IARGS */ +#include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */ #include "exec/cpu_ldst.h" #include "tcg-op.h"