|
 |
0a122b |
From 6470641f3ae91f9024ac19c9884a583074930c78 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
Date: Tue, 11 Feb 2014 16:14:30 +0100
|
|
|
0a122b |
Subject: [PATCH 24/28] block: remove qcow2 .bdrv_make_empty implementation
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
Message-id: <342af85f3ded3eeaa140e44b2f4956bd6d1ee45c.1392134912.git.jcody@redhat.com>
|
|
|
0a122b |
Patchwork-id: 57220
|
|
|
0a122b |
O-Subject: [RHEL7 qemu-kvm PATCH 6/6] block: remove qcow2 .bdrv_make_empty implementation
|
|
|
0a122b |
Bugzilla: 1047254
|
|
|
0a122b |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
The QCOW2 .bdrv_make_empty implementation always returns 0 for success,
|
|
|
0a122b |
but does not actually do anything.
|
|
|
0a122b |
|
|
|
0a122b |
The proper way to not support an optional driver function stub is to
|
|
|
0a122b |
just not implement it, so let's remove the stub.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
0a122b |
Reviewed-by: Benoit Canet <benoit@irqsave.net>
|
|
|
0a122b |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
(cherry picked from commit 14b4a8b9c654b625dea0f532fae5722781fd0a7d)
|
|
|
0a122b |
---
|
|
|
0a122b |
block/qcow2.c | 21 ---------------------
|
|
|
0a122b |
1 file changed, 21 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
block/qcow2.c | 21 ---------------------
|
|
|
0a122b |
1 files changed, 0 insertions(+), 21 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
0a122b |
index 05ea0cd..25a5b5e 100644
|
|
|
0a122b |
--- a/block/qcow2.c
|
|
|
0a122b |
+++ b/block/qcow2.c
|
|
|
0a122b |
@@ -1678,26 +1678,6 @@ static int qcow2_create(const char *filename, QEMUOptionParameter *options,
|
|
|
0a122b |
return ret;
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
-static int qcow2_make_empty(BlockDriverState *bs)
|
|
|
0a122b |
-{
|
|
|
0a122b |
-#if 0
|
|
|
0a122b |
- /* XXX: not correct */
|
|
|
0a122b |
- BDRVQcowState *s = bs->opaque;
|
|
|
0a122b |
- uint32_t l1_length = s->l1_size * sizeof(uint64_t);
|
|
|
0a122b |
- int ret;
|
|
|
0a122b |
-
|
|
|
0a122b |
- memset(s->l1_table, 0, l1_length);
|
|
|
0a122b |
- if (bdrv_pwrite(bs->file, s->l1_table_offset, s->l1_table, l1_length) < 0)
|
|
|
0a122b |
- return -1;
|
|
|
0a122b |
- ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length);
|
|
|
0a122b |
- if (ret < 0)
|
|
|
0a122b |
- return ret;
|
|
|
0a122b |
-
|
|
|
0a122b |
- l2_cache_reset(bs);
|
|
|
0a122b |
-#endif
|
|
|
0a122b |
- return 0;
|
|
|
0a122b |
-}
|
|
|
0a122b |
-
|
|
|
0a122b |
static coroutine_fn int qcow2_co_write_zeroes(BlockDriverState *bs,
|
|
|
0a122b |
int64_t sector_num, int nb_sectors, BdrvRequestFlags flags)
|
|
|
0a122b |
{
|
|
|
0a122b |
@@ -2246,7 +2226,6 @@ static BlockDriver bdrv_qcow2 = {
|
|
|
0a122b |
.bdrv_has_zero_init = bdrv_has_zero_init_1,
|
|
|
0a122b |
.bdrv_co_get_block_status = qcow2_co_get_block_status,
|
|
|
0a122b |
.bdrv_set_key = qcow2_set_key,
|
|
|
0a122b |
- .bdrv_make_empty = qcow2_make_empty,
|
|
|
0a122b |
|
|
|
0a122b |
.bdrv_co_readv = qcow2_co_readv,
|
|
|
0a122b |
.bdrv_co_writev = qcow2_co_writev,
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|