diff options
author | Kevin Wolf <kwolf@redhat.com> | 2020-07-10 14:17:17 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2020-07-17 14:20:57 +0200 |
commit | 1c404d756fd59ecee09dec924b88c492d24b3fc8 (patch) | |
tree | fc4e1d01849d58ad36a3e49567edc4558f48ddd6 /qemu-img.c | |
parent | a08464521ccb302a24c7785f50ce32473904136c (diff) | |
download | qemu-1c404d756fd59ecee09dec924b88c492d24b3fc8.zip qemu-1c404d756fd59ecee09dec924b88c492d24b3fc8.tar.gz qemu-1c404d756fd59ecee09dec924b88c492d24b3fc8.tar.bz2 |
qemu-img resize: Require --shrink for shrinking all image formats
QEMU 2.11 introduced the --shrink option for qemu-img resize to avoid
accidentally shrinking images (commit 4ffca8904a3). However, for
compatibility reasons, it was not enforced for raw images yet, but only
a deprecation warning was printed. This warning has existed for long
enough that we can now finally require --shrink for raw images, too, and
error out if it's not given.
Documentation already describes the state as it is after this patch.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200710121717.28339-1-kwolf@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r-- | qemu-img.c | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -4004,20 +4004,12 @@ static int img_resize(int argc, char **argv) } if (total_size < current_size && !shrink) { + error_report("Use the --shrink option to perform a shrink operation."); warn_report("Shrinking an image will delete all data beyond the " "shrunken image's end. Before performing such an " "operation, make sure there is no important data there."); - - if (g_strcmp0(bdrv_get_format_name(blk_bs(blk)), "raw") != 0) { - error_report( - "Use the --shrink option to perform a shrink operation."); - ret = -1; - goto out; - } else { - warn_report("Using the --shrink option will suppress this message. " - "Note that future versions of qemu-img may refuse to " - "shrink images without this option."); - } + ret = -1; + goto out; } /* |