From patchwork Fri Apr 8 20:28:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8785801 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 24ACFC0553 for ; Fri, 8 Apr 2016 20:37:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B34E202F2 for ; Fri, 8 Apr 2016 20:37:04 +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 C70AE202EC for ; Fri, 8 Apr 2016 20:37:03 +0000 (UTC) Received: from localhost ([::1]:58111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod9L-0002Qq-5c for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:37:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2B-000481-Ha for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod2A-000271-JB for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:39 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2A-00026t-Co for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:38 -0400 Received: by mail-wm0-x244.google.com with SMTP id a140so6838746wma.2 for ; Fri, 08 Apr 2016 13:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=sVX/6F5nXVpFcJ9eDc+tviA8zcbCqGs98wp5niYfe20=; b=0lWk4pk2EXKY3ispYlZQqulgOXCtmIR8P4Kcj5P8TL2mW3tgVSEg5X0SSWhMCZ27h3 iLlGP50hOVIFyTGKeOm7y0g4DWnSfkc57+DiPexshmp5TwW9u529PMcNB/v3gC4eMOK6 JCIkzMLRwqk1JGy6191tyellxUeNtMkvRp9yTGU/hXiCbWC1GYUEOl6nRCmpnR3bBl29 liSFcfWRCEOeWYxPx4m9sethG2e1V+jpjHlv72JWXDyrJPNk90gWjV8sU3BQi3ju7Lek fjCrFBce3J9eJJlL6l89FjjTPG67hSbU8Lpo7vnpo2qycqGiq7y3/znsrjDpSlAY5JbO m7ug== 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:subject:date:message-id :in-reply-to:references; bh=sVX/6F5nXVpFcJ9eDc+tviA8zcbCqGs98wp5niYfe20=; b=PZqIXcTaYvy50tJkvFEIU4HJvP1VP6mCP48BC6ZyH7aajtp2k+bsruwIkl3wHMiHwo kmj0TO3EzKA2weihPo2RuA6QkZM32RDXqT3+IzOo2cHOMl1SCmXdDKPLNx5c2Q8RSjf8 B8D4m/1dPNdsiVFA5KQ4Mn2lWKiP5Vhx+kcTpuxaPO/D4CcvCrzzPMoR3+7wO8IrGnlR oJgw4iMg/rMZZILxUX4xgFGR5NCwzbtWmUPeV4PzDKRsEBeFo/q+KlBs5ABfcYPB7iG0 KuAgIeBL8ztpi5trXCZwc143NahfFM0qozUfXkNSYtpyOqheRNLnqgRLrq3ah3UltpP+ utKA== X-Gm-Message-State: AD7BkJJHx1W6njpjFPs8HaXQ86Hi+nTeeCDLTmvHCbDQQQsfSQMLBI0qTF5KJTqRRqXTVA== X-Received: by 10.28.182.195 with SMTP id g186mr5611504wmf.72.1460147377881; Fri, 08 Apr 2016 13:29:37 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id w10sm3849168wjz.9.2016.04.08.13.29.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:44 +0200 Message-Id: <1460147350-7601-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> References: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 24/50] alpha: include cpu-qom.h in files that require AlphaCPU 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 This will keep things working when cpu.h will not be included indirectly almost everywhere (either directly or through qemu-common.h). Signed-off-by: Paolo Bonzini --- hw/alpha/alpha_sys.h | 1 + hw/alpha/pci.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index e11025b..fcaeb2b 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -3,6 +3,7 @@ #ifndef HW_ALPHA_H #define HW_ALPHA_H 1 +#include "target-alpha/cpu-qom.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/ide.h" diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c index 5baa0ea..8dde637 100644 --- a/hw/alpha/pci.c +++ b/hw/alpha/pci.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "cpu.h" #include "alpha_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h"