From patchwork Wed Jul 20 16:24:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 105979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8C131B6F6F for ; Thu, 21 Jul 2011 16:39:41 +1000 (EST) Received: from localhost ([::1]:53774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qjdnc-0008H7-EG for incoming@patchwork.ozlabs.org; Wed, 20 Jul 2011 16:55:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhI-00060G-F3 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZhD-0001MA-4H for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:31 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhB-0001Kw-OE for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:26 -0400 Received: from oxygen-old.pond.sub.org (unknown [IPv6:2a01:4f8:130:9021::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "oxygen.pond.sub.org", Issuer "CAcert Class 3 Root" (verified OK)) by oxygen.pond.sub.org (Postfix) with ESMTPS id 263A4A2488; Wed, 20 Jul 2011 18:32:24 +0200 (CEST) Received: from blackfin.pond.sub.org (p5B32D5F4.dip.t-dialin.net [91.50.213.244]) by oxygen-old.pond.sub.org (Postfix) with ESMTPA id CB73F2771D0; Wed, 20 Jul 2011 18:32:23 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 94C8D3F1; Wed, 20 Jul 2011 18:24:33 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 20 Jul 2011 18:24:23 +0200 Message-Id: <1311179069-27882-50-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 49/55] block: Declare qemu_blockalign() in block.h, not block_int.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 Device models should be able to use it without an unclean include of block_int.h. Signed-off-by: Markus Armbruster --- block.h | 2 ++ block_int.h | 2 -- hw/sd.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/block.h b/block.h index b6eaaba..8f52abb 100644 --- a/block.h +++ b/block.h @@ -264,6 +264,8 @@ int bdrv_img_create(const char *filename, const char *fmt, const char *base_filename, const char *base_fmt, char *options, uint64_t img_size, int flags); +void *qemu_blockalign(BlockDriverState *bs, size_t size); + #define BDRV_SECTORS_PER_DIRTY_CHUNK 2048 void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable); diff --git a/block_int.h b/block_int.h index 7e74d01..768c842 100644 --- a/block_int.h +++ b/block_int.h @@ -213,8 +213,6 @@ void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque); void qemu_aio_release(void *p); -void *qemu_blockalign(BlockDriverState *bs, size_t size); - #ifdef _WIN32 int is_windows_drive(const char *filename); #endif diff --git a/hw/sd.c b/hw/sd.c index 4dc9047..fdd87b0 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -31,7 +31,6 @@ #include "hw.h" #include "block.h" -#include "block_int.h" #include "sd.h" //#define DEBUG_SD 1