From: Peter Krempa Date: Fri, 16 Sep 2011 12:14:16 +0000 (+0200) Subject: build: storage: Macro 'MKFS' is undefined on some platforms. X-Git-Tag: v0.9.5-rc3~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc35f12a45369156af9cd055705cfad4be6b1f3d;p=thirdparty%2Flibvirt.git build: storage: Macro 'MKFS' is undefined on some platforms. Mac OS X 10.6. Snow Leopard and probably other do not provide a mkfs command to create filesystems. Macro MKFS then remained undefined and did not provide any substitute, so that build failed on a missing argument. --- diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02c4c175a3..da98f87b51 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -625,6 +625,8 @@ virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED, #endif /* #if HAVE_LIBBLKID */ +/* some platforms don't support mkfs */ +#ifdef MKFS static int virStorageBackendExecuteMKFS(const char *device, const char *format) @@ -647,6 +649,19 @@ virStorageBackendExecuteMKFS(const char *device, } return ret; } +#else /* #ifdef MKFS */ +static int +virStorageBackendExecuteMKFS(const char *device ATTRIBUTE_UNUSED, + const char *format ATTRIBUTE_UNUSED) +{ + virStorageReportError(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(virStoragePoolObjPtr pool,