From 8c2aac34f6491d31f8da672f257db42dad3030ee Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 14 Feb 2012 11:13:59 +0100 Subject: [PATCH 34/99] qcow2-refcount: remove write-only variables RH-Author: Kevin Wolf Message-id: <1329218101-24213-35-git-send-email-kwolf@redhat.com> Patchwork-id: 37224 O-Subject: [RHEL-6.3 qemu-kvm PATCH v2 34/96] qcow2-refcount: remove write-only variables Bugzilla: 783950 RH-Acked-by: Paolo Bonzini RH-Acked-by: Marcelo Tosatti RH-Acked-by: Laszlo Ersek From: Blue Swirl Bugzilla: 783950 Variables l2_modified and l2_size are not really used, remove them. Spotted by GCC 4.6.0: CC block/qcow2-refcount.o /src/qemu/block/qcow2-refcount.c: In function 'qcow2_update_snapshot_refcount': /src/qemu/block/qcow2-refcount.c:708:37: error: variable 'l2_modified' set but not used [-Werror=unused-but-set-variable] /src/qemu/block/qcow2-refcount.c:708:9: error: variable 'l2_size' set but not used [-Werror=unused-but-set-variable] CC: Kevin Wolf Signed-off-by: Blue Swirl Signed-off-by: Kevin Wolf (cherry picked from commit 1869a65385e9d81f490b4203dd070cc49b7749c9) --- block/qcow2-refcount.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) Signed-off-by: Michal Novotny --- block/qcow2-refcount.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index d75d322..48a4d7a 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -704,7 +704,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, BDRVQcowState *s = bs->opaque; uint64_t *l1_table, *l2_table, l2_offset, offset, l1_size2, l1_allocated; int64_t old_offset, old_l2_offset; - int l2_size, i, j, l1_modified, l2_modified, nb_csectors, refcount; + int i, j, l1_modified, nb_csectors, refcount; int ret; l2_table = NULL; @@ -729,14 +729,12 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, l1_allocated = 0; } - l2_size = s->l2_size * sizeof(uint64_t); l1_modified = 0; for(i = 0; i < l1_size; i++) { l2_offset = l1_table[i]; if (l2_offset) { old_l2_offset = l2_offset; l2_offset &= ~QCOW_OFLAG_COPIED; - l2_modified = 0; ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset, (void**) &l2_table); @@ -788,7 +786,6 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, s->refcount_block_cache); } l2_table[j] = cpu_to_be64(offset); - l2_modified = 1; qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table); } } -- 1.7.7.5