From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 8 Sep 2021 15:07:31 +0000 (+0200)
Subject: virstoragetest: Don't rewrite the 'qcow2' image
X-Git-Tag: v7.8.0-rc1~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8732224a7dfc45e3de6b971213dfab4ea3a4cfc;p=thirdparty%2Flibvirt.git

virstoragetest: Don't rewrite the 'qcow2' image

Create it with the appropriate backing file path rather than using
another instance of 'qemu-img rebase'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 1ee7bb5230..9a7905e28d 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -132,18 +132,15 @@ testPrepImages(void)
     /* Create a qcow2 wrapping relative raw; later on, we modify its
      * metadata to test other configurations */
     virCommandFree(cmd);
-    cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL);
-    virCommandAddArgFormat(cmd, "-obacking_file=raw,backing_fmt=raw%s",
-                           compat ? ",compat=0.10" : "");
+    cmd = virCommandNewArgList(qemuimg, "create",
+                               "-f", "qcow2",
+                               "-F", "raw",
+                               "-b", absraw, NULL);
+    if (compat)
+        virCommandAddArgList(cmd, "-o", "compat=0.10", NULL);
     virCommandAddArg(cmd, "qcow2");
     if (virCommandRun(cmd, NULL) < 0)
         goto skip;
-    /* Make sure our later uses of 'qemu-img rebase' will work */
-    virCommandFree(cmd);
-    cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
-                               "-F", "raw", "-b", absraw, "qcow2", NULL);
-    if (virCommandRun(cmd, NULL) < 0)
-        goto skip;
 
     /* Create a second qcow2 wrapping the first, to be sure that we
      * can correctly avoid insecure probing.  */