]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: storage: Macro 'MKFS' is undefined on some platforms.
authorPeter Krempa <pkrempa@redhat.com>
Fri, 16 Sep 2011 12:14:16 +0000 (14:14 +0200)
committerDaniel Veillard <veillard@redhat.com>
Fri, 16 Sep 2011 13:07:02 +0000 (21:07 +0800)
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.

src/storage/storage_backend_fs.c

index 02c4c175a3e33b59d93930f4262d842d6997ca5a..da98f87b512e0fbd3f39bbd46d6ea00f1c997e90 100644 (file)
@@ -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,