From patchwork Tue Aug 23 13:21:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 111117 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 E2FC9B6FD7 for ; Wed, 24 Aug 2011 00:08:16 +1000 (EST) Received: from localhost ([::1]:47737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvqvx-00033I-JR for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 09:22:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvqvq-0002xR-9G for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qvqvn-0007CR-Ka for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:22:18 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:33438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvqvn-00079U-Ha for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:22:15 -0400 Received: by gxk26 with SMTP id 26so88898gxk.4 for ; Tue, 23 Aug 2011 06:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=t2GqtE7oEhR0YkNa+dVJh8/SuQBnX/htvKpnmxirsO8=; b=hPesIQa/yVkOz+NE5BE9sGknxRk9rbFZO+KLyZtTDQpx02A+28B4TiKPGwf4Mr/4Mt ZmUV7e17o6M1uT/BMECUqzDAj6qED5YovFI7fgOzLR1mx92VIKhIV4VwpdNufum1oZz9 YWwgK4u/44159GXdDWcQokquiYKVfOeTK3C+I= Received: by 10.146.92.4 with SMTP id p4mr3659585yab.19.1314105729748; Tue, 23 Aug 2011 06:22:09 -0700 (PDT) Received: from obol602.omnitel.it (tor-exit-router37-readme.formlessnetworking.net [199.48.147.37]) by mx.google.com with ESMTPS id a29sm227805yhj.3.2011.08.23.06.22.03 (version=SSLv3 cipher=OTHER); Tue, 23 Aug 2011 06:22:08 -0700 (PDT) From: Frediano Ziglio To: kwolf@redhat.com Date: Tue, 23 Aug 2011 15:21:16 +0200 Message-Id: <1314105682-28396-10-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1314105682-28396-1-git-send-email-freddy77@gmail.com> References: <1314105682-28396-1-git-send-email-freddy77@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.173 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH v3 09/15] qcow2: remove cluster_offset from QCowAIOCB 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 Signed-off-by: Frediano Ziglio --- block/qcow2.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 4b9ec29..7e13283 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -378,7 +378,6 @@ typedef struct QCowAIOCB { QEMUIOVector *qiov; int remaining_sectors; uint64_t bytes_done; - uint64_t cluster_offset; uint8_t *cluster_data; QEMUIOVector hd_qiov; } QCowAIOCB; @@ -394,6 +393,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) int index_in_cluster, n1; int ret; int cur_nr_sectors; /* number of sectors in current iteration */ + uint64_t cluster_offset = 0; if (acb->remaining_sectors == 0) { /* request completed */ @@ -408,7 +408,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) } ret = qcow2_get_cluster_offset(bs, acb->sector_num << 9, - &cur_nr_sectors, &acb->cluster_offset); + &cur_nr_sectors, &cluster_offset); if (ret < 0) { return ret; } @@ -419,7 +419,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done, cur_nr_sectors * 512); - if (!acb->cluster_offset) { + if (!cluster_offset) { if (bs->backing_hd) { /* read from the base image */ @@ -439,9 +439,9 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) /* Note: in this case, no need to wait */ qemu_iovec_memset(&acb->hd_qiov, 0, 512 * cur_nr_sectors); } - } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) { + } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) { /* add AIO support for compressed blocks ? */ - ret = qcow2_decompress_cluster(bs, acb->cluster_offset); + ret = qcow2_decompress_cluster(bs, cluster_offset); if (ret < 0) { return ret; } @@ -450,7 +450,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) s->cluster_cache + index_in_cluster * 512, 512 * cur_nr_sectors); } else { - if ((acb->cluster_offset & 511) != 0) { + if ((cluster_offset & 511) != 0) { return -EIO; } @@ -474,7 +474,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); qemu_co_mutex_unlock(&s->lock); ret = bdrv_co_readv(bs->file, - (acb->cluster_offset >> 9) + index_in_cluster, + (cluster_offset >> 9) + index_in_cluster, cur_nr_sectors, &acb->hd_qiov); qemu_co_mutex_lock(&s->lock); if (ret < 0) { @@ -512,7 +512,6 @@ static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, acb->bytes_done = 0; acb->remaining_sectors = nb_sectors; - acb->cluster_offset = 0; return acb; } @@ -564,6 +563,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) int ret; int cur_nr_sectors; /* number of sectors in current iteration */ QCowL2Meta l2meta; + uint64_t cluster_offset; l2meta.nb_clusters = 0; qemu_co_queue_init(&l2meta.dependent_requests); @@ -585,8 +585,8 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) return ret; } - acb->cluster_offset = l2meta.cluster_offset; - assert((acb->cluster_offset & 511) == 0); + cluster_offset = l2meta.cluster_offset; + assert((cluster_offset & 511) == 0); qemu_iovec_reset(&acb->hd_qiov); qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done, @@ -612,7 +612,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO); qemu_co_mutex_unlock(&s->lock); ret = bdrv_co_writev(bs->file, - (acb->cluster_offset >> 9) + index_in_cluster, + (cluster_offset >> 9) + index_in_cluster, cur_nr_sectors, &acb->hd_qiov); qemu_co_mutex_lock(&s->lock); if (ret < 0) {