aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/osdep.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/util/osdep.c b/util/osdep.c
index 3de4a1826c..a2863c8e53 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -38,6 +38,14 @@ extern int madvise(caddr_t, size_t, int);
#include "qemu/error-report.h"
#include "monitor/monitor.h"
+#ifdef F_OFD_SETLK
+#define QEMU_SETLK F_OFD_SETLK
+#define QEMU_GETLK F_OFD_GETLK
+#else
+#define QEMU_SETLK F_SETLK
+#define QEMU_GETLK F_GETLK
+#endif
+
static bool fips_enabled = false;
static const char *hw_version = QEMU_HW_VERSION;
@@ -143,7 +151,6 @@ static int qemu_parse_fdset(const char *param)
static int qemu_lock_fcntl(int fd, int64_t start, int64_t len, int fl_type)
{
-#ifdef F_OFD_SETLK
int ret;
struct flock fl = {
.l_whence = SEEK_SET,
@@ -151,11 +158,8 @@ static int qemu_lock_fcntl(int fd, int64_t start, int64_t len, int fl_type)
.l_len = len,
.l_type = fl_type,
};
- ret = fcntl(fd, F_OFD_SETLK, &fl);
+ ret = fcntl(fd, QEMU_SETLK, &fl);
return ret == -1 ? -errno : 0;
-#else
- return -ENOTSUP;
-#endif
}
int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive)
@@ -170,7 +174,6 @@ int qemu_unlock_fd(int fd, int64_t start, int64_t len)
int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive)
{
-#ifdef F_OFD_SETLK
int ret;
struct flock fl = {
.l_whence = SEEK_SET,
@@ -178,15 +181,12 @@ int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive)
.l_len = len,
.l_type = exclusive ? F_WRLCK : F_RDLCK,
};
- ret = fcntl(fd, F_OFD_GETLK, &fl);
+ ret = fcntl(fd, QEMU_GETLK, &fl);
if (ret == -1) {
return -errno;
} else {
return fl.l_type == F_UNLCK ? 0 : -EAGAIN;
}
-#else
- return -ENOTSUP;
-#endif
}
#endif