From patchwork Tue Dec 18 07:53:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 207040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7C5E42C0094 for ; Tue, 18 Dec 2012 18:54:29 +1100 (EST) Received: from localhost ([::1]:52260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tks0R-0003R6-FF for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 02:54:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tks05-0003Hm-Hk for qemu-devel@nongnu.org; Tue, 18 Dec 2012 02:54:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tks02-0002fo-9Y for qemu-devel@nongnu.org; Tue, 18 Dec 2012 02:54:05 -0500 Received: from cantor2.suse.de ([195.135.220.15]:32774 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tks02-0002fX-3A for qemu-devel@nongnu.org; Tue, 18 Dec 2012 02:54:02 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 70E1BA398D; Tue, 18 Dec 2012 08:54:01 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2012 08:53:41 +0100 Message-Id: <1355817223-13076-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355817223-13076-1-git-send-email-afaerber@suse.de> References: <1355817223-13076-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , David Gibson Subject: [Qemu-devel] [PATCH RFC qom-cpu 2/4] qemu-common.h: Move fprintf_function to qemu-types.h 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 avoids a dependency on qemu-common.h from qemu/cpu.h. Signed-off-by: Andreas Färber --- include/qemu/cpu.h | 2 +- qemu-common.h | 5 ----- qemu-types.h | 6 ++++++ 3 Dateien geändert, 7 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index 5fbb3f9..d737fcd 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -21,7 +21,7 @@ #define QEMU_CPU_H #include "qemu/object.h" -#include "qemu-common.h" +#include "qemu-types.h" #include "qemu-thread.h" /** diff --git a/qemu-common.h b/qemu-common.h index e674786..98ab78d 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -12,7 +12,6 @@ #ifndef QEMU_COMMON_H #define QEMU_COMMON_H -#include "compiler.h" #include "config-host.h" #include "qemu-types.h" @@ -24,7 +23,6 @@ /* we put basic includes here to avoid repeating them in device drivers */ #include -#include #include #include #include @@ -95,9 +93,6 @@ struct iovec { #include #endif -typedef int (*fprintf_function)(FILE *f, const char *fmt, ...) - GCC_FMT_ATTR(2, 3); - #ifdef _WIN32 #define fsync _commit #if !defined(lseek) diff --git a/qemu-types.h b/qemu-types.h index fd532a2..f7a7194 100644 --- a/qemu-types.h +++ b/qemu-types.h @@ -1,6 +1,12 @@ #ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H +#include "compiler.h" +#include + +typedef int (*fprintf_function)(FILE *f, const char *fmt, ...) + GCC_FMT_ATTR(2, 3); + /* A load of opaque types so that device init declarations don't have to pull in all the real definitions. */ typedef struct QEMUTimer QEMUTimer;