From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy3B1-0008G8-DC for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qy3Az-0000ZJ-OQ for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:51:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy3Az-0000Yz-BP for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:51:01 -0400 From: Kevin Wolf Date: Mon, 29 Aug 2011 16:53:22 +0200 Message-Id: <1314629618-8308-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1314629618-8308-1-git-send-email-kwolf@redhat.com> References: <1314629618-8308-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/30] qcow: move some blocks of code to avoid useless variable initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Frediano Ziglio Signed-off-by: Frediano Ziglio Signed-off-by: Kevin Wolf --- block/qcow.c | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index 7727604..8c559e2 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -522,35 +522,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); @@ -575,7 +558,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 ? */ @@ -584,7 +566,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; @@ -602,6 +583,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; } @@ -633,16 +631,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; @@ -685,6 +679,11 @@ redo: if (ret < 0) { return ret; } + + acb->nb_sectors -= n; + acb->sector_num += n; + acb->buf += n * 512; + goto redo; } -- 1.7.6