From patchwork Thu May 19 11:18:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9126611 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 ADB9CBF29F for ; Thu, 19 May 2016 11:29:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F36E920219 for ; Thu, 19 May 2016 11:29:07 +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 577A1201FE for ; Thu, 19 May 2016 11:29:06 +0000 (UTC) Received: from localhost ([::1]:49732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3M8X-0004k7-D1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:29:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lz8-0004OG-PL for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lz2-00049Z-4g for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:21 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lz1-00049S-UG for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:16 -0400 Received: by mail-wm0-x242.google.com with SMTP id r12so20128554wme.0 for ; Thu, 19 May 2016 04:19:15 -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=xXqvFGImCfqjCYQsUB8LiQDdN3tj3KNSFJ8osCSMJeIQ8tLz+bEdVSjIBeXWuCpjTa lMffGsx1udRe38jHxgoZ2iltjeaJPpMElm/9EBcQoFiDs/ECEudvoWfckRMH4cLTaTIK 8MHxaEhqr9nS7shWPROfbPpYBrTaUv2S2Usu3rTvD2wroRfvXQ/hbOKlwJiM/gn2ETHM D6pgDCe8QbQ5byKpKBdSlk2SdhmOAHJIo26HMA1NugyXZME/bAjCTlvyqvf3ni3p895h JfBkMrvNG98z9CJrEDH7xRnVga8uP2+Kk0WyQ4oBnSNQa5okULDp4QBBzOH4WG9wQ1aA 97rg== 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=OWgq2FAbEpIvOLkPq76MWs6fYc/CcP9djizs3slGrtSk+AZ7sMNhAqpXJrEUn7LkEP Ih+xM6TShwssd1hl8mpqViLLtr7KfvXa5cynBo4oL4/2Sl4aEfGtKmP8snPht5qcx8C4 ZipmJ0D5eTXs2Uh0VjvlhBjltrsBLM6wz/TKn8A+v5M0zNik0tHv9MnOUItWRNvI2zLZ /YqXN1hLnyL1ypdRzcyGI4qeCFLGg1hzbZg8uP0y79M6cEPUvYYP7YEcSBvDn7tso4z4 y52VJ8IJEHcpGV1z2GmALwhauYn8N+USal3JnQBDZMhnRerRmZxAztHpx+pCTLtt1DZ7 q4XQ== X-Gm-Message-State: AOPr4FULBG3tUq5KrgQK5Qv34ZzdzsIOpeUmsrx6/GBO96qt4usjhzK3DVekE7YtIUHPBw== X-Received: by 10.28.129.132 with SMTP id c126mr316087wmd.18.1463656755413; Thu, 19 May 2016 04:19:15 -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 c7sm8374317wji.38.2016.05.19.04.19.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:20 +0200 Message-Id: <1463656726-35952-27-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-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::242 Subject: [Qemu-devel] [PULL 26/52] 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"