2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From 411a7e4ad457f7f3c9f1d02ef9f726ce13a35f08 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Fri, 6 Sep 2013 12:32:25 +0200
|
|
Subject: [PATCH] qcow2: Pass discard type to qcow2_discard_clusters()
|
|
|
|
The function will be used internally instead of only being called for
|
|
guest discard requests.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
block/qcow2-cluster.c | 8 ++++----
|
|
block/qcow2.c | 2 +-
|
|
block/qcow2.h | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
|
|
index cca76d4..8c3185d 100644
|
|
--- a/block/qcow2-cluster.c
|
|
+++ b/block/qcow2-cluster.c
|
|
@@ -1317,7 +1317,7 @@ int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
|
|
* clusters.
|
|
*/
|
|
static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
|
|
- unsigned int nb_clusters)
|
|
+ unsigned int nb_clusters, enum qcow2_discard_type type)
|
|
{
|
|
BDRVQcowState *s = bs->opaque;
|
|
uint64_t *l2_table;
|
|
@@ -1346,7 +1346,7 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
|
|
l2_table[l2_index + i] = cpu_to_be64(0);
|
|
|
|
/* Then decrease the refcount */
|
|
- qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);
|
|
+ qcow2_free_any_clusters(bs, old_offset, 1, type);
|
|
}
|
|
|
|
ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
|
|
@@ -1358,7 +1358,7 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
|
|
}
|
|
|
|
int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,
|
|
- int nb_sectors)
|
|
+ int nb_sectors, enum qcow2_discard_type type)
|
|
{
|
|
BDRVQcowState *s = bs->opaque;
|
|
uint64_t end_offset;
|
|
@@ -1381,7 +1381,7 @@ int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,
|
|
|
|
/* Each L2 table is handled by its own loop iteration */
|
|
while (nb_clusters > 0) {
|
|
- ret = discard_single_l2(bs, offset, nb_clusters);
|
|
+ ret = discard_single_l2(bs, offset, nb_clusters, type);
|
|
if (ret < 0) {
|
|
goto fail;
|
|
}
|
|
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
index 7f7282e..16e45a0 100644
|
|
--- a/block/qcow2.c
|
|
+++ b/block/qcow2.c
|
|
@@ -1506,7 +1506,7 @@ static coroutine_fn int qcow2_co_discard(BlockDriverState *bs,
|
|
|
|
qemu_co_mutex_lock(&s->lock);
|
|
ret = qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS,
|
|
- nb_sectors);
|
|
+ nb_sectors, QCOW2_DISCARD_REQUEST);
|
|
qemu_co_mutex_unlock(&s->lock);
|
|
return ret;
|
|
}
|
|
diff --git a/block/qcow2.h b/block/qcow2.h
|
|
index dba9771..52cf193 100644
|
|
--- a/block/qcow2.h
|
|
+++ b/block/qcow2.h
|
|
@@ -405,7 +405,7 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
|
|
|
|
int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);
|
|
int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,
|
|
- int nb_sectors);
|
|
+ int nb_sectors, enum qcow2_discard_type type);
|
|
int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_sectors);
|
|
|
|
/* qcow2-snapshot.c functions */
|