qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/1] qemu-img: do not erase destination file in qemu-img dd command
@ 2023-09-30 20:31 Mike Maslenkin
  2023-10-01 12:25 ` Denis V. Lunev
  0 siblings, 1 reply; 9+ messages in thread
From: Mike Maslenkin @ 2023-09-30 20:31 UTC (permalink / raw)
  Cc: qemu-devel, qemu-block, kwolf, hreitz, den, Mike Maslenkin

Add a check that destination file exists and do not call bdrv_create for
this case.

Currently `qemu-img dd` command destroys content of destination file.
Effectively this means that parameters (geometry) of destination image
file are changing. This can be undesirable behavior for user especially
if format of destination image does not support resizing.

Steps to reproduce:
  1. Create empty disk image with some non default size.
       `qemu-img  create -f qcow2 $DEST_IMG 3T`
     Remember that `qemu-img info $DEST_IMG` returns:
       virtual size: 3 TiB (3298534883328 bytes)
       disk size: 240 KiB
       cluster_size: 65536
  2. Run `qemu-img dd -O qcow2 of=$DEST_IMG if=$SRC_IMG bs=1M count=100`
  3. Check `qemu-img info $DEST_IMG` output:
       virtual size: 100 MiB (104857600 bytes)
       disk size: 112 MiB
       cluster_size: 65536

Parameters of $DEST_IMG were changed. Actually `qemu-img dd` has created
a new disk based on current default geometry for particular format.
For example for "parallels" format default BAT for 256GB disk is written
to empty file prior writing disk image data.

With this patch virtual disk metadata and geometry of a destination image
are preserved. As another visible change of `qemu-img dd` behavior is that
if destination image is less than source it can finish with error (similar
to "dd" utility):
  qemu-img: error while writing to output image file: Input/output error

Signed-off-by: Mike Maslenkin <mike.maslenkin@gmail.com>
---
  diff from v1: removed additional fprintf call leaved in patch by accident
---
 qemu-img.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index a48edb71015c..1a83c14212fb 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -5150,13 +5150,15 @@ static int img_dd(int argc, char **argv)
                             size - in.bsz * in.offset, &error_abort);
     }
 
-    ret = bdrv_create(drv, out.filename, opts, &local_err);
-    if (ret < 0) {
-        error_reportf_err(local_err,
-                          "%s: error while creating output image: ",
-                          out.filename);
-        ret = -1;
-        goto out;
+    if (!g_file_test(out.filename, G_FILE_TEST_EXISTS)) {
+        ret = bdrv_create(drv, out.filename, opts, &local_err);
+        if (ret < 0) {
+            error_reportf_err(local_err,
+                               "%s: error while creating output image: ",
+                               out.filename);
+            ret = -1;
+            goto out;
+        }
     }
 
     /* TODO, we can't honour --image-opts for the target,
-- 
2.32.0 (Apple Git-132)



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-11-01 17:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-30 20:31 [PATCH v2 1/1] qemu-img: do not erase destination file in qemu-img dd command Mike Maslenkin
2023-10-01 12:25 ` Denis V. Lunev
2023-10-01 17:08   ` Mike Maslenkin
2023-10-01 20:46     ` Denis V. Lunev
2023-10-31 14:33       ` Hanna Czenczek
2023-11-01 16:26         ` Eric Blake
2023-11-01 16:51         ` Daniel P. Berrangé
2023-11-01 17:03           ` Denis V. Lunev
2023-11-01 17:22             ` Daniel P. Berrangé

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).