From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 8 Sep 2021 15:14:29 +0000 (+0200)
Subject: virstoragetest: testPrepImages: Use 'qemu-img' to format 'raw' image
X-Git-Tag: v7.8.0-rc1~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa3b29f8fc5a4452fac2624f227870812b3730e8;p=thirdparty%2Flibvirt.git

virstoragetest: testPrepImages: Use 'qemu-img' to format 'raw' image

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 90dde512cf..c258bc1709 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -86,9 +86,9 @@ static int
 testPrepImages(void)
 {
     int ret = EXIT_FAILURE;
+    g_autoptr(virCommand) cmdraw = NULL;
     g_autoptr(virCommand) cmdqcow2 = NULL;
     g_autoptr(virCommand) cmdwrap = NULL;
-    g_autofree char *buf = NULL;
     g_autofree char *absraw = g_strdup_printf("%s/raw", datadir);
     g_autofree char *absqcow2 = g_strdup_printf("%s/qcow2", datadir);
     g_autofree char *qemuimg = virFindFileInPath("qemu-img");
@@ -111,11 +111,11 @@ testPrepImages(void)
         goto cleanup;
     }
 
-    buf = g_strdup_printf("%1024d", 0);
-    if (virFileWriteStr("raw", buf, 0600) < 0) {
-        fprintf(stderr, "unable to create raw file\n");
-        goto cleanup;
-    }
+    cmdraw = virCommandNewArgList(qemuimg, "create",
+                                  "-f", "raw",
+                                  absraw, "1k",  NULL);
+    if (virCommandRun(cmdraw, NULL) < 0)
+        goto skip;
 
     /* Create a qcow2 wrapping relative raw; later on, we modify its
      * metadata to test other configurations */