| Message ID | 20220426092715.3931705-10-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Misc cleanups | expand |
On 4/26/22 02:26, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau<marcandre.lureau@redhat.com> > > It is only used by block/file-posix.c, move it there. > > Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com> > --- > include/sysemu/os-posix.h | 2 -- > block/file-posix.c | 15 +++++++++++++++ > util/oslib-posix.c | 15 --------------- > 3 files changed, 15 insertions(+), 17 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h index adbe19d3e468..58de7c994d85 100644 --- a/include/sysemu/os-posix.h +++ b/include/sysemu/os-posix.h @@ -96,8 +96,6 @@ static inline void qemu_funlockfile(FILE *f) funlockfile(f); } -int fcntl_setfl(int fd, int flag); - #ifdef __cplusplus } #endif diff --git a/block/file-posix.c b/block/file-posix.c index bfd9b2111143..48cd0966249d 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1022,6 +1022,21 @@ static int raw_handle_perm_lock(BlockDriverState *bs, return ret; } +/* Sets a specific flag */ +static int fcntl_setfl(int fd, int flag) +{ + int flags; + + flags = fcntl(fd, F_GETFL); + if (flags == -1) { + return -errno; + } + if (fcntl(fd, F_SETFL, flags | flag) == -1) { + return -errno; + } + return 0; +} + static int raw_reconfigure_getfd(BlockDriverState *bs, int flags, int *open_flags, uint64_t perm, bool force_dup, Error **errp) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 03d97741562c..43f4b0d2a7ca 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -816,21 +816,6 @@ size_t qemu_get_host_physmem(void) return 0; } -/* Sets a specific flag */ -int fcntl_setfl(int fd, int flag) -{ - int flags; - - flags = fcntl(fd, F_GETFL); - if (flags == -1) { - return -errno; - } - if (fcntl(fd, F_SETFL, flags | flag) == -1) { - return -errno; - } - return 0; -} - int qemu_msync(void *addr, size_t length, int fd) { size_t align_mask = ~(qemu_real_host_page_size() - 1);