From patchwork Fri Jun 15 15:05:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 165188 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 EDAFFB70B6 for ; Sat, 16 Jun 2012 02:16:04 +1000 (EST) Received: from localhost ([::1]:59071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfZBq-0002B2-Om for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2012 12:16:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfY85-00057H-LU for qemu-devel@nongnu.org; Fri, 15 Jun 2012 11:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfY7z-0005GP-Ct for qemu-devel@nongnu.org; Fri, 15 Jun 2012 11:08:05 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:49781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfY7z-0004fx-22 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 11:07:59 -0400 Received: by mail-pz0-f45.google.com with SMTP id n2so3246681dad.4 for ; Fri, 15 Jun 2012 08:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=RDSuBhhu7s9y/8KwXfWj70p4UUshlYO0nflUcDAoEYY=; b=0QszHI1JBSkKd1mZr8HTSXyxjJLZtkLPmVE0ve/MqZGtziF1oBpYJYOkuw8kMZOslS eYbm+JKl3LAG30zQQVOqvEpayVNGPGqffZTKDeNQWlsO5ppKzSc16rMi8EcGD2mO6/2G 5wVhyZnDvag4obAiiH4zQaZi8TL74LXz/H97hM/t5IFJWi1ZBrjZlEKz+wgqc/OVTQ+n kktRJRm+Gs9WoTkLr7+/vKfTtj/1gPKrv6BBtaXFAusRMEv23IEDAUOHynRTiDxDsFG6 VBDT9JqBxBTIoCQVFq4Dz2RE1xpz3j0J1dIOrJn3C35zDevTdAcNoAyvCGQvHS1OCw6q d63A== Received: by 10.68.135.201 with SMTP id pu9mr19840498pbb.146.1339772878157; Fri, 15 Jun 2012 08:07:58 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-204-25.ip51.fastwebnet.it. [93.34.204.25]) by mx.google.com with ESMTPS id rs3sm13501390pbc.47.2012.06.15.08.07.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Jun 2012 08:07:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Jun 2012 17:05:55 +0200 Message-Id: <1339772759-31004-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.2 In-Reply-To: <1339772759-31004-1-git-send-email-pbonzini@redhat.com> References: <1339772759-31004-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, lcapitulino@redhat.com Subject: [Qemu-devel] [RFC PATCH 32/36] block: make round_to_clusters public 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 is needed in the following patch. Signed-off-by: Paolo Bonzini --- block.c | 16 ++++++++-------- block.h | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index a105f9e..35ceed5 100644 --- a/block.c +++ b/block.c @@ -1456,10 +1456,10 @@ static void tracked_request_begin(BdrvTrackedRequest *req, /** * Round a region to cluster boundaries */ -static void round_to_clusters(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, - int64_t *cluster_sector_num, - int *cluster_nb_sectors) +void bdrv_round_to_clusters(BlockDriverState *bs, + int64_t sector_num, int nb_sectors, + int64_t *cluster_sector_num, + int *cluster_nb_sectors) { BlockDriverInfo bdi; @@ -1501,8 +1501,8 @@ static void coroutine_fn wait_for_overlapping_requests(BlockDriverState *bs, * CoR read and write operations are atomic and guest writes cannot * interleave between them. */ - round_to_clusters(bs, sector_num, nb_sectors, - &cluster_sector_num, &cluster_nb_sectors); + bdrv_round_to_clusters(bs, sector_num, nb_sectors, + &cluster_sector_num, &cluster_nb_sectors); do { retry = false; @@ -1811,8 +1811,8 @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BlockDriverState *bs, /* Cover entire cluster so no additional backing file I/O is required when * allocating cluster in the image file. */ - round_to_clusters(bs, sector_num, nb_sectors, - &cluster_sector_num, &cluster_nb_sectors); + bdrv_round_to_clusters(bs, sector_num, nb_sectors, + &cluster_sector_num, &cluster_nb_sectors); trace_bdrv_co_do_copy_on_readv(bs, sector_num, nb_sectors, cluster_sector_num, cluster_nb_sectors); diff --git a/block.h b/block.h index 0d8f21c..a79f26b 100644 --- a/block.h +++ b/block.h @@ -312,6 +312,10 @@ int bdrv_get_flags(BlockDriverState *bs); int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, const uint8_t *buf, int nb_sectors); int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi); +void bdrv_round_to_clusters(BlockDriverState *bs, + int64_t sector_num, int nb_sectors, + int64_t *cluster_sector_num, + int *cluster_nb_sectors); const char *bdrv_get_encrypted_filename(BlockDriverState *bs); void bdrv_get_backing_filename(BlockDriverState *bs,