From patchwork Fri Jul 22 08:46:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 106238 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 C5964B6F71 for ; Fri, 22 Jul 2011 18:47:15 +1000 (EST) Received: from localhost ([::1]:58986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkBO0-0004Z3-0o for incoming@patchwork.ozlabs.org; Fri, 22 Jul 2011 04:47:08 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkBNn-0004K7-Dr for qemu-devel@nongnu.org; Fri, 22 Jul 2011 04:46:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QkBNl-0002KY-Pp for qemu-devel@nongnu.org; Fri, 22 Jul 2011 04:46:55 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:33733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkBNl-00025G-Iq for qemu-devel@nongnu.org; Fri, 22 Jul 2011 04:46:53 -0400 Received: by mail-ww0-f53.google.com with SMTP id 26so1778685wwf.10 for ; Fri, 22 Jul 2011 01:46:53 -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=iskpAfvJaNS4KoyW1xVMgxnRwI0kdnf23/j7A6jQRA0=; b=bXT3sXx+6JF1V3eaYnBTpM7gCh8yHdqjFX6KhjUtmdlRURVpeYfVuTyWtYDRj9fM9A JKSQj7KeGaQekoUjZmkw364AgiyvIntVoUvpa/6gV/Lx3fEd1cgB7f6TAOEDP1sJMdtJ O2GpREMpAXotPDtgNp0SfyCVedBwJIEhj5XbI= Received: by 10.227.19.130 with SMTP id a2mr1033842wbb.88.1311324413126; Fri, 22 Jul 2011 01:46:53 -0700 (PDT) Received: from localhost.localdomain (rockhall.torservers.net [77.247.181.163]) by mx.google.com with ESMTPS id gd1sm1720338wbb.27.2011.07.22.01.46.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Jul 2011 01:46:52 -0700 (PDT) From: Frediano Ziglio To: qemu-devel@nongnu.org Date: Fri, 22 Jul 2011 10:46:28 +0200 Message-Id: <1311324390-27830-4-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311324390-27830-1-git-send-email-freddy77@gmail.com> References: <1311324390-27830-1-git-send-email-freddy77@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: Kevin Wolf , Frediano Ziglio Subject: [Qemu-devel] [PATCH 3/5] 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 e52df91..015a472 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); @@ -572,7 +555,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 ? */ @@ -581,7 +563,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; @@ -599,6 +580,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; } @@ -630,16 +628,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; @@ -681,6 +675,11 @@ static int qcow_aio_write_cb(QCowAIOCB *acb) if (ret < 0) { return ret; } + + acb->nb_sectors -= n; + acb->sector_num += n; + acb->buf += n * 512; + goto redo; }