]> xenbits.xensource.com Git - libvirt.git/commitdiff
storage_backend_fs: use MKFS ony if WITH_STORAGE_FS is defined
authorPavel Hrdina <phrdina@redhat.com>
Wed, 21 Apr 2021 13:31:12 +0000 (15:31 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Wed, 21 Apr 2021 15:26:12 +0000 (17:26 +0200)
The code in storage_backend_fs is used for storage_dir and storage_fs
drivers so some parts need to be guarded by checking for
WITH_STORAGE_FS.

Fixes: 16c69e7aaed4cabfd8e8c19cc326854d4c480437
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/storage/storage_backend_fs.c

index af645ea9def084be34b58a79fd3b39370b36cec0..be3c3c68394ae7833af42d7891b5e41ee6cd56d9 100644 (file)
@@ -402,7 +402,11 @@ virStorageBackendExecuteMKFS(const char *device,
                              const char *format)
 {
     g_autoptr(virCommand) cmd = NULL;
-    g_autofree char *mkfs = virFindFileInPath(MKFS);
+    g_autofree char *mkfs = NULL;
+
+#if WITH_STORAGE_FS
+    mkfs = virFindFileInPath(MKFS);
+#endif /* WITH_STORAGE_FS */
 
     if (!mkfs) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -412,7 +416,7 @@ virStorageBackendExecuteMKFS(const char *device,
         return -1;
     }
 
-    cmd = virCommandNewArgList(MKFS, "-t", format, NULL);
+    cmd = virCommandNewArgList(mkfs, "-t", format, NULL);
 
     /* use the force, otherwise mkfs.xfs won't overwrite existing fs.
      * Similarly mkfs.ext2, mkfs.ext3, and mkfs.ext4 require supplying -F