From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36948 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq6m4-0004zQ-B3 for qemu-devel@nongnu.org; Mon, 30 Aug 2010 11:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oq6m3-0007g5-2m for qemu-devel@nongnu.org; Mon, 30 Aug 2010 11:59:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43837) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oq6m2-0007fw-Ot for qemu-devel@nongnu.org; Mon, 30 Aug 2010 11:59:55 -0400 From: Jes.Sorensen@redhat.com Date: Mon, 30 Aug 2010 17:59:14 +0200 Message-Id: <1283183960-28404-9-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1283183960-28404-1-git-send-email-Jes.Sorensen@redhat.com> References: <1283183960-28404-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 08/14] Remove unused argument for qcow2_encrypt_sectors() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Jes.Sorensen@redhat.com From: Jes Sorensen Signed-off-by: Jes Sorensen --- block/qcow2-cluster.c | 17 ++++++++--------- block/qcow2.c | 10 +++++----- block/qcow2.h | 7 +++---- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 166922f..14aaf7a 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -319,9 +319,8 @@ static int count_contiguous_free_clusters(uint64_t nb_clusters, uint64_t *l2_tab /* The crypt function is compatible with the linux cryptoloop algorithm for < 4 GB images. NOTE: out_buf == in_buf is supported */ -void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, - uint8_t *out_buf, const uint8_t *in_buf, - int nb_sectors, int enc, +void qcow2_encrypt_sectors(int64_t sector_num, uint8_t *out_buf, + const uint8_t *in_buf, int nb_sectors, int enc, const AES_KEY *key) { union { @@ -382,8 +381,8 @@ static int qcow_read(BlockDriverState *bs, int64_t sector_num, if (ret != n * 512) return -1; if (s->crypt_method) { - qcow2_encrypt_sectors(s, sector_num, buf, buf, n, 0, - &s->aes_decrypt_key); + qcow2_encrypt_sectors(sector_num, buf, buf, n, 0, + &s->aes_decrypt_key); } } nb_sectors -= n; @@ -407,10 +406,10 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect, if (ret < 0) return ret; if (s->crypt_method) { - qcow2_encrypt_sectors(s, start_sect + n_start, - s->cluster_data, - s->cluster_data, n, 1, - &s->aes_encrypt_key); + qcow2_encrypt_sectors(start_sect + n_start, + s->cluster_data, + s->cluster_data, n, 1, + &s->aes_encrypt_key); } BLKDBG_EVENT(bs->file, BLKDBG_COW_WRITE); ret = bdrv_write_sync(bs->file, (cluster_offset >> 9) + n_start, diff --git a/block/qcow2.c b/block/qcow2.c index a53014d..e7ba7b4 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -397,9 +397,9 @@ static void qcow_aio_read_cb(void *opaque, int ret) /* nothing to do */ } else { if (s->crypt_method) { - qcow2_encrypt_sectors(s, acb->sector_num, acb->buf, acb->buf, - acb->cur_nr_sectors, 0, - &s->aes_decrypt_key); + qcow2_encrypt_sectors(acb->sector_num, acb->buf, acb->buf, + acb->cur_nr_sectors, 0, + &s->aes_decrypt_key); } } @@ -609,8 +609,8 @@ static void qcow_aio_write_cb(void *opaque, int ret) acb->cluster_data = qemu_mallocz(QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); } - qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data, acb->buf, - acb->cur_nr_sectors, 1, &s->aes_encrypt_key); + qcow2_encrypt_sectors(acb->sector_num, acb->cluster_data, acb->buf, + acb->cur_nr_sectors, 1, &s->aes_encrypt_key); src_buf = acb->cluster_data; } else { src_buf = acb->buf; diff --git a/block/qcow2.h b/block/qcow2.h index 3ff162e..477b0f9 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -191,10 +191,9 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res); int qcow2_grow_l1_table(BlockDriverState *bs, int min_size); void qcow2_l2_cache_reset(BlockDriverState *bs); int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); -void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, - uint8_t *out_buf, const uint8_t *in_buf, - int nb_sectors, int enc, - const AES_KEY *key); +void qcow2_encrypt_sectors(int64_t sector_num, uint8_t *out_buf, + const uint8_t *in_buf, int nb_sectors, int enc, + const AES_KEY *key); int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset, int *num, uint64_t *cluster_offset); -- 1.7.2.2