This patch changes fdatasync() to fsync() to compile cleanly in OS X. --- src/storage/storage_backend.c | 2 +- src/storage/storage_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d125504..ee39836 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -208,7 +208,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } while ((amtleft -= interval) > 0); } - if (fdatasync(fd) < 0) { + if (fsync(fd) < 0) { ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), vol->target.path); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c05b74e..aea4c71 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1783,7 +1783,7 @@ storageWipeExtent(virStorageVolDefPtr vol, remaining -= written; } - if (fdatasync(fd) < 0) { + if (fsync(fd) < 0) { ret = -errno; virReportSystemError(errno, _("cannot sync data to volume with path '%s'"), -- 1.7.3.4

Mingw lacks fsync, but gnulib provides that. Meanwhile, gnulib does not (yet) provide fdatasync, so this is a quick hack to fake that function on MacOS X; we can revert this configure change once gnulib gives us a real module. * bootstrap.conf (gnulib_modules): Add fsync. * configure.ac (AC_CHECK_FUNCS_ONCE): Check for fdatasync, and fake it with fsync when not present. --- I've tested that this is a no-op on Linux, but would appreciate someone with a MacOS setup to quickly test that it fixes the build there. bootstrap.conf | 1 + configure.ac | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 94af051..e609ba8 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -42,6 +42,7 @@ fcntl fcntl-h ffs fnmatch +fsync func getaddrinfo getcwd-lgpl diff --git a/configure.ac b/configure.ac index 5e3539f..611a141 100644 --- a/configure.ac +++ b/configure.ac @@ -126,9 +126,12 @@ AC_CHECK_SIZEOF([long]) dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions -AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ +AC_CHECK_FUNCS_ONCE([cfmakeraw fdatasync geteuid getgid getgrnam_r getmntent_r \ getpwuid_r getuid initgroups kill mmap posix_fallocate posix_memalign \ regexec sched_getaffinity]) +if test $ac_cv_func_fdatasync = no; then + AC_DEFINE([fdatasync], [fsync], [Define to fsync if you lack fdatasync]) +fi dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. -- 1.7.4.4

Struct virStoragePoolProbeResult was compiled in conditionaly, but virStorageBackendFileSystemProbe used it unconditionaly. This patch exempts the struct from conditional include. --- src/storage/storage_backend_fs.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_fs.h b/src/storage/storage_backend_fs.h index 54c6739..4f69056 100644 --- a/src/storage/storage_backend_fs.h +++ b/src/storage/storage_backend_fs.h @@ -29,12 +29,13 @@ # if WITH_STORAGE_FS extern virStorageBackend virStorageBackendFileSystem; extern virStorageBackend virStorageBackendNetFileSystem; +# endif + typedef enum { FILESYSTEM_PROBE_FOUND, FILESYSTEM_PROBE_NOT_FOUND, FILESYSTEM_PROBE_ERROR, } virStoragePoolProbeResult; -# endif extern virStorageBackend virStorageBackendDirectory; #endif /* __VIR_STORAGE_BACKEND_FS_H__ */ -- 1.7.3.4

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 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02c4c17..da98f87 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, -- 1.7.3.4