From 16c69e7aaed4cabfd8e8c19cc326854d4c480437 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 15 Apr 2021 01:09:21 +0200 Subject: [PATCH] storage: use virFindFileInPath to validate presence of mkfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Future patch will remove MKFS define as we will no longer check it during compilation. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrangé --- src/storage/storage_backend_fs.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index bb93d64bbe..af645ea9de 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -397,13 +397,20 @@ virStorageBackendFileSystemCheck(virStoragePoolObj *pool, return 0; } -/* some platforms don't support mkfs */ -#ifdef MKFS static int virStorageBackendExecuteMKFS(const char *device, const char *format) { g_autoptr(virCommand) cmd = NULL; + g_autofree char *mkfs = virFindFileInPath(MKFS); + + if (!mkfs) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("mkfs is not available on this platform: " + "Failed to make filesystem of type '%s' on device '%s'"), + format, device); + return -1; + } cmd = virCommandNewArgList(MKFS, "-t", format, NULL); @@ -426,19 +433,6 @@ virStorageBackendExecuteMKFS(const char *device, return 0; } -#else /* #ifdef MKFS */ -static int -virStorageBackendExecuteMKFS(const char *device G_GNUC_UNUSED, - const char *format G_GNUC_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("mkfs is not supported on this platform: " - "Failed to make filesystem of " - "type '%s' on device '%s'"), - format, device); - return -1; -} -#endif /* #ifdef MKFS */ static int virStorageBackendMakeFileSystem(virStoragePoolObj *pool,