[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/30] qcow: remove old #undefined code
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 16/30] qcow: remove old #undefined code |
Date: |
Mon, 29 Aug 2011 16:53:24 +0200 |
From: Frediano Ziglio <address@hidden>
Signed-off-by: Frediano Ziglio <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow.c | 63 ----------------------------------------------------------
1 files changed, 0 insertions(+), 63 deletions(-)
diff --git a/block/qcow.c b/block/qcow.c
index 4495afe..c8bfecc 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -192,24 +192,6 @@ static int qcow_set_key(BlockDriverState *bs, const char
*key)
return -1;
if (AES_set_decrypt_key(keybuf, 128, &s->aes_decrypt_key) != 0)
return -1;
-#if 0
- /* test */
- {
- uint8_t in[16];
- uint8_t out[16];
- uint8_t tmp[16];
- for(i=0;i<16;i++)
- in[i] = i;
- AES_encrypt(in, tmp, &s->aes_encrypt_key);
- AES_decrypt(tmp, out, &s->aes_decrypt_key);
- for(i = 0; i < 16; i++)
- printf(" %02x", tmp[i]);
- printf("\n");
- for(i = 0; i < 16; i++)
- printf(" %02x", out[i]);
- printf("\n");
- }
-#endif
return 0;
}
@@ -443,51 +425,6 @@ static int decompress_cluster(BlockDriverState *bs,
uint64_t cluster_offset)
return 0;
}
-#if 0
-
-static int qcow_read(BlockDriverState *bs, int64_t sector_num,
- uint8_t *buf, int nb_sectors)
-{
- BDRVQcowState *s = bs->opaque;
- int ret, index_in_cluster, n;
- uint64_t cluster_offset;
-
- while (nb_sectors > 0) {
- cluster_offset = get_cluster_offset(bs, sector_num << 9, 0, 0, 0, 0);
- index_in_cluster = sector_num & (s->cluster_sectors - 1);
- n = s->cluster_sectors - index_in_cluster;
- if (n > nb_sectors)
- n = nb_sectors;
- if (!cluster_offset) {
- if (bs->backing_hd) {
- /* read from the base image */
- ret = bdrv_read(bs->backing_hd, sector_num, buf, n);
- if (ret < 0)
- return -1;
- } else {
- memset(buf, 0, 512 * n);
- }
- } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) {
- if (decompress_cluster(bs, cluster_offset) < 0)
- return -1;
- memcpy(buf, s->cluster_cache + index_in_cluster * 512, 512 * n);
- } else {
- ret = bdrv_pread(bs->file, cluster_offset + index_in_cluster *
512, buf, n * 512);
- if (ret != n * 512)
- return -1;
- if (s->crypt_method) {
- encrypt_sectors(s, sector_num, buf, buf, n, 0,
- &s->aes_decrypt_key);
- }
- }
- nb_sectors -= n;
- sector_num += n;
- buf += n * 512;
- }
- return 0;
-}
-#endif
-
static int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
int nb_sectors, QEMUIOVector *qiov)
{
--
1.7.6
- [Qemu-devel] [PATCH 10/30] block: include flush requests in info blockstats, (continued)
- [Qemu-devel] [PATCH 10/30] block: include flush requests in info blockstats, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 12/30] qcow/qcow2: Allocate QCowAIOCB structure using stack, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 19/30] qcow2: remove l2meta from QCowAIOCB, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 13/30] qcow: QCowAIOCB field cleanup, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 08/30] qemu-img: print error codes when convert fails, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 15/30] qcow: Remove QCowAIOCB, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 14/30] qcow: move some blocks of code to avoid useless variable initialization, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 20/30] qcow2: remove cluster_offset from QCowAIOCB, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 21/30] qcow2: remove common from QCowAIOCB, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 25/30] sheepdog: use coroutines, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 16/30] qcow: remove old #undefined code,
Kevin Wolf <=
- [Qemu-devel] [PATCH 17/30] qcow2: Removed unused AIOCB fields, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 18/30] qcow2: removed cur_nr_sectors field in QCowAIOCB, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 22/30] qcow2: reindent and use while before the big jump, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 23/30] qcow2: Removed QCowAIOCB entirely, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 30/30] qemu-img: Require larger zero areas for sparse handling, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 27/30] qcow2: remove unused qcow2_create_refcount_update function, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 26/30] qcow2: use always stderr for debugging, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 29/30] block: latency accounting, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 28/30] block: explicit I/O accounting, Kevin Wolf, 2011/08/29
- [Qemu-devel] [PATCH 24/30] qcow2: remove memory leak, Kevin Wolf, 2011/08/29