From patchwork Mon May 16 15:35:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 622653 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r7lZk3Wqbz9sDX for ; Tue, 17 May 2016 02:01:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CKiOoZ53; dkim-atps=neutral Received: from localhost ([::1]:44644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2Kxo-0007qK-BG for incoming@patchwork.ozlabs.org; Mon, 16 May 2016 12:01:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZq-00027c-KS for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2KZh-0006dj-D2 for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:02 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:32863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZg-0006dD-NC for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:53 -0400 Received: by mail-wm0-x243.google.com with SMTP id r12so18962960wme.0 for ; Mon, 16 May 2016 08:36:52 -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=CKiOoZ53bgG3HCR9zgrbYBaq0+dFeSCDiBURnDgeckadNNzq2Kx6s2gUv4hbfmBiD2 j6uhLQ/Hecv5w17Vd7O66QeEDsT+/40xnKIB8WGR4hkFoMfr7W3U0hPVR3N4sfloofl/ FiGmJH9b6c5pbGfGWxQ21i6q4E/IPAkx9OoLfWMr6mD+GmetJbYsgFsINnj66iNJDxzk 8UEgpfB4/hnLs6NSOUwFODuHK3htc90h1G5SL31+qr9JaXUnfMQ+x2DS7aT6aKMvNzgc yPgb1UQQuMTsWo2jEeiJRmEHlBVZRqjrmmpFUj0Ux2S+FdCSj/uW8E6khPLiCQStnsI2 x6fA== 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=MRvoDOoKVDtKnzeNWGF6e4taGhgoOX96/Iw12QWgv3i3xzsFSXH8G9dXxJGQyYVnXE fqonxOPpDFiXTbI611syPYbug9yATsJhPE9g2bry5DqT/4tbmrc49JWw5bg1EVihklaO hbIJRcPUcyKp1M5CIg6sa3no1OT2X7dDCEvyXpEarW42a+2RhOkCqnvRDwKjBaDb8KNj uGrPa2UpbAMTHAZ4OwCPdue+wjlZ2Bzirq+Tg5HdF+RUj42iXzkypT3sS6eyaVYTqD2p 3r9DMnb+UBh+bQnTPZ/hmm6X5vnk1rYI5fQWfdfAGWEu9ly64f3U5zCVD/DSCv2EW+UA qfRw== X-Gm-Message-State: AOPr4FXgT2XIDgqRYSDhxZfmySLBdY5qS+xvK7Vod3+KQKh1ElNJswEErbV5IuYaG0KpaQ== X-Received: by 10.28.26.200 with SMTP id a191mr19736244wma.55.1463413012176; Mon, 16 May 2016 08:36:52 -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 lf9sm34386875wjc.44.2016.05.16.08.36.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2016 08:36:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2016 17:35:56 +0200 Message-Id: <1463412982-6681-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> References: <1463412982-6681-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::243 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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"