From patchwork Sun Jun 7 21:59:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 481763 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 10A27140283 for ; Mon, 8 Jun 2015 08:00:04 +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=UiJN3i0p; dkim-atps=neutral Received: from localhost ([::1]:55290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1ibn-0002GE-Lk for incoming@patchwork.ozlabs.org; Sun, 07 Jun 2015 17:59:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1ibX-0001uZ-A8 for qemu-devel@nongnu.org; Sun, 07 Jun 2015 17:59:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1ibT-00076p-V3 for qemu-devel@nongnu.org; Sun, 07 Jun 2015 17:59:43 -0400 Received: from mail-qk0-x233.google.com ([2607:f8b0:400d:c09::233]:36469) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1ibT-00076l-Pd; Sun, 07 Jun 2015 17:59:39 -0400 Received: by qkx62 with SMTP id 62so69170267qkx.3; Sun, 07 Jun 2015 14:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=AoapN1Dt5P0wjG0W9VIDrV+IBYWfDIHsqxW3qkgnsX0=; b=UiJN3i0pUpZTewDhbm+0jAaSAnv/409MvMstdRabbLzVnd1TpgMLSrVEfh2BeUEQHF dncuYut5BX4/+LKnuW2t0qK/hyyXj53RQv54M40BijaXWz7XDh9JdW9lH8wKNX1hkbGz 2WBdRCsUmWXaEV//bzJ5oA1x9dKWgqCuCIRrHY+ZzOSEWMHwUn5TgXfmvpBE86QUdebP qXN68p5AeGknJNDE+e/RiDNZXdnwCPIcBQouyZ88AFA1Tbeo7E6R7H/23HBBxW/+7KBw WKbv7TBUVCpiJAXZCXxmh6q5tFhPb/OKbHXUX4+xcu2hH5ULXJe+UTJNIXAH7qA3Ko7d /4Yg== X-Received: by 10.55.41.211 with SMTP id p80mr26246221qkp.32.1433714378466; Sun, 07 Jun 2015 14:59:38 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-24-5-157-48.hsd1.ca.comcast.net. [24.5.157.48]) by mx.google.com with ESMTPSA id p84sm366658qkh.10.2015.06.07.14.59.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jun 2015 14:59:37 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sun, 7 Jun 2015 14:59:09 -0700 Message-Id: <1433714349-7262-1-git-send-email-crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::233 Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, Peter Crosthwaite Subject: [Qemu-devel] [PATCH v2] memory_mapping: Rework cpu related includes 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This makes it more consistent with all other core code files, which either just rely on qemu-common.h inclusion or precede cpu.h with qemu-common.h. cpu-all.h should not be included in addition to cpu.h. Remove it. Signed-off-by: Peter Crosthwaite Acked-by: Paolo Bonzini --- changed since v1: Leave in cpu.h include Picked up by my multi arch WIP where target-multi/cpu.h cant handle random core code inclusion without preceeded qemu-common.h. I guess this is the only one in tree? --- memory_mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/memory_mapping.c b/memory_mapping.c index 7b69801..36d6b26 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -13,8 +13,8 @@ #include +#include "qemu-common.h" #include "cpu.h" -#include "exec/cpu-all.h" #include "sysemu/memory_mapping.h" #include "exec/memory.h" #include "exec/address-spaces.h"