External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

storage: remove use of stat-time.h headers

Browse Source 
The gnulib stat-time.h header provides wrapper functions
to hide the differences in 'struct stat' between various
platforms.

Linux and FreeBSD support the same names, except for
birthtime which Linux only provides in the new 'statx()'
syscall we're not using. macOS has completely different
naming. Since we only rely on this code in one place
we just use conditionals at time of need.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-01-22 11:38:28 +00:00
parent 47744e0694
commit d575590c52
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/storage/storage_util.c
View File

@ -71,7 +71,6 @@
#include "virfile.h"
#include "virjson.h"
#include "virqemu.h"
#include "stat-time.h"
#include "virstring.h"
#include "virxml.h"
#include "virfdstream.h"
@ -1830,10 +1829,22 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target,
if (!target->timestamps && VIR_ALLOC(target->timestamps) < 0)
return -1;
target->timestamps->atime = get_stat_atime(sb);
target->timestamps->btime = get_stat_birthtime(sb);
target->timestamps->ctime = get_stat_ctime(sb);
target->timestamps->mtime = get_stat_mtime(sb);
#ifdef __APPLE__
target->timestamps->atime = sb->st_atimespec;
target->timestamps->btime = sb->st_birthtimespec;
target->timestamps->ctime = sb->st_ctimespec;
target->timestamps->mtime = sb->st_mtimespec;
#else /* ! __APPLE__ */
target->timestamps->atime = sb->st_atim;
# ifdef __linux__
target->timestamps->btime = (struct timespec){0, 0};
# else /* ! __linux__ */
target->timestamps->btime = sb->st_birthtim;
# endif /* ! __linux__ */
target->timestamps->ctime = sb->st_ctim;
target->timestamps->mtime = sb->st_mtim;
#endif /* ! __APPLE__ */
target->type = VIR_STORAGE_TYPE_FILE;