From patchwork Mon Jan 21 12:03:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 14145 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 125C823E33 for ; Mon, 21 Jan 2013 12:03:53 +0000 (UTC) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by fiordland.canonical.com (Postfix) with ESMTP id BDD7CA18CF5 for ; Mon, 21 Jan 2013 12:03:52 +0000 (UTC) Received: by mail-vb0-f42.google.com with SMTP id ff1so3230747vbb.1 for ; Mon, 21 Jan 2013 04:03:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=xCmfcmMtyU85gxhbrtQ4UfNEur4VGbH947Duq2QlV4k=; b=RN8aiMjv+2i8lhqTCjchGSRy0MIsfpWkc5ytigUi6yiKsia3cI9Vmg65EfoPE11LOj FSKIAGzXEOEjMKsuH2aBujEN0P224YpWJGqEC7gbRon2kjUvX8JjwdOnzdryxJ1ZRUcc yz+p2plrzEywMGitbMaM+YWusI6XCXWOw2Qn1xldaGWP9iGwy3sBjUdv3wbpY2+RBhyo ul1sVYjCZFKofX0P43mzIxQD8g3hScyDjbdo1EaCkksMq7GcJVFBH+smpvAMEdF6RSkd XUKY4D3pdL9Pj+L1R0zwwSGqrvcRovIYjy3qHUcSxH9y310WIh4cPvJ1ar6Y6jz2N/HM XxUQ== X-Received: by 10.52.70.205 with SMTP id o13mr16694712vdu.75.1358769832118; Mon, 21 Jan 2013 04:03:52 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp197661veb; Mon, 21 Jan 2013 04:03:51 -0800 (PST) X-Received: by 10.194.77.13 with SMTP id o13mr25873202wjw.58.1358769830718; Mon, 21 Jan 2013 04:03:50 -0800 (PST) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id lv9si4803104wjb.36.2013.01.21.04.03.49 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:03:50 -0800 (PST) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TxG6N-0001uS-Du; Mon, 21 Jan 2013 12:03:47 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org, Paolo Bonzini , Stefan Hajnoczi Subject: [PATCH v2] qemu-pixman.h: Avoid mutual inclusion loop with console.h Date: Mon, 21 Jan 2013 12:03:47 +0000 Message-Id: <1358769827-7317-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQnBFGBhkYvZUPYsfMUYz3PsS26+KzcmTM1CCvvC3R1MQwUoRcdpe28yZGS1ihNPygcMSDpt Remove an unnecessary mutual inclusion loop between qemu-pixman.h and console.h, since the former was only including the latter for 'PixelFormat*', which can be provided by typedefs.h. This requires a minor adjustment to the files which included qemu-pixman.h, since they were relying on it implicitly dragging in all of console.h. Signed-off-by: Peter Maydell Acked-by: Gerd Hoffmann --- Stefan: I've made the obvious change to fix the spice compile issue, but none of my systems have a new enough spice-protocol/spice-server to allow me to configure with spice enabled. I'd appreciate it if you could check it does indeed compile OK now... include/ui/qemu-pixman.h | 2 +- include/ui/spice-display.h | 1 + ui/qemu-pixman.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index 016fd87..b032f52 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -15,7 +15,7 @@ #pragma GCC diagnostic error "-Wredundant-decls" #endif -#include "console.h" +#include "qemu/typedefs.h" /* * pixman image formats are defined to be native endian, diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 8b192e9..46f9530 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -21,6 +21,7 @@ #include "qemu/thread.h" #include "ui/qemu-pixman.h" +#include "ui/console.h" #include "sysemu/sysemu.h" #define NUM_MEMSLOTS 8 diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 609335a..6dcbe90 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -3,7 +3,8 @@ * See the COPYING file in the top-level directory. */ -#include "ui/qemu-pixman.h" +#include "qemu-common.h" +#include "ui/console.h" int qemu_pixman_get_type(int rshift, int gshift, int bshift) {