From patchwork Tue Aug 9 07:46:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 109149 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 DD1FAB6F86 for ; Tue, 9 Aug 2011 17:47:09 +1000 (EST) Received: from localhost ([::1]:37121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qqh1i-0003qi-IE for incoming@patchwork.ozlabs.org; Tue, 09 Aug 2011 03:47:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qqh1X-0003di-IV for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:46:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qqh1V-0006o3-TW for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:46:51 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:37438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qqh1V-0006lw-OY for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:46:49 -0400 Received: by mail-ew0-f45.google.com with SMTP id 24so2618658ewy.4 for ; Tue, 09 Aug 2011 00:46:49 -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=9gBcJpzpAV9cotaWzYkfZveQrjT1R12U2oCRW3/fvi0=; b=RanSeuCFJEFfmBod5l59hLjx/6nqQO46kuNMXFXRys6LbgB1zTWApvCl1vjuRcVTfg AUHsObcvp9fW3F/XlvX/CbXbMmD6THnTB8ZbZwgNv7zso118hB6CNXCJBIUCG4pswa0X QYb55IwAuDuLNyijhm+QNsxBRdQg7bppuJeGc= Received: by 10.213.16.194 with SMTP id p2mr615149eba.17.1312876009323; Tue, 09 Aug 2011 00:46:49 -0700 (PDT) Received: from obol602.omnitel.it ([206.217.137.183]) by mx.google.com with ESMTPS id p49sm2857459eef.58.2011.08.09.00.46.46 (version=SSLv3 cipher=OTHER); Tue, 09 Aug 2011 00:46:48 -0700 (PDT) From: Frediano Ziglio To: kwolf@redhat.com Date: Tue, 9 Aug 2011 09:46:38 +0200 Message-Id: <1312876010-15361-4-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1312876010-15361-1-git-send-email-freddy77@gmail.com> References: <1312876010-15361-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.215.45 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH v2 03/15] qcow: move some blocks of code to avoid useless variable initialization 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/qcow.c | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index f0b1599..e17f9c5 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -520,35 +520,18 @@ static int qcow_aio_read_cb(QCowAIOCB *acb) BlockDriverState *bs = acb->bs; BDRVQcowState *s = bs->opaque; int index_in_cluster; - int ret, n = 0; - uint64_t cluster_offset = 0; + int ret, n; + uint64_t cluster_offset; struct iovec hd_iov; QEMUIOVector hd_qiov; redo: - /* post process the read buffer */ - if (!cluster_offset) { - /* nothing to do */ - } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) { - /* nothing to do */ - } else { - if (s->crypt_method) { - encrypt_sectors(s, acb->sector_num, acb->buf, acb->buf, - n, 0, - &s->aes_decrypt_key); - } - } - - acb->nb_sectors -= n; - acb->sector_num += n; - acb->buf += n * 512; - if (acb->nb_sectors == 0) { /* request completed */ return 0; } - /* prepare next AIO request */ + /* prepare next request */ cluster_offset = get_cluster_offset(bs, acb->sector_num << 9, 0, 0, 0, 0); index_in_cluster = acb->sector_num & (s->cluster_sectors - 1); @@ -573,7 +556,6 @@ static int qcow_aio_read_cb(QCowAIOCB *acb) } else { /* Note: in this case, no need to wait */ memset(acb->buf, 0, 512 * n); - goto redo; } } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) { /* add AIO support for compressed blocks ? */ @@ -582,7 +564,6 @@ static int qcow_aio_read_cb(QCowAIOCB *acb) } memcpy(acb->buf, s->cluster_cache + index_in_cluster * 512, 512 * n); - goto redo; } else { if ((cluster_offset & 511) != 0) { return -EIO; @@ -600,6 +581,23 @@ static int qcow_aio_read_cb(QCowAIOCB *acb) } } + /* post process the read buffer */ + if (!cluster_offset) { + /* nothing to do */ + } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) { + /* nothing to do */ + } else { + if (s->crypt_method) { + encrypt_sectors(s, acb->sector_num, acb->buf, acb->buf, + n, 0, + &s->aes_decrypt_key); + } + } + + acb->nb_sectors -= n; + acb->sector_num += n; + acb->buf += n * 512; + goto redo; } @@ -631,16 +629,12 @@ static int qcow_aio_write_cb(QCowAIOCB *acb) int index_in_cluster; uint64_t cluster_offset; const uint8_t *src_buf; - int ret, n = 0; + int ret, n; uint8_t *cluster_data = NULL; struct iovec hd_iov; QEMUIOVector hd_qiov; redo: - acb->nb_sectors -= n; - acb->sector_num += n; - acb->buf += n * 512; - if (acb->nb_sectors == 0) { /* request completed */ return 0; @@ -683,6 +677,11 @@ redo: if (ret < 0) { return ret; } + + acb->nb_sectors -= n; + acb->sector_num += n; + acb->buf += n * 512; + goto redo; }