OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: move fcntl_setfl()

Browse Source 
It is only used by block/file-posix.c, move it there.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Marc-André Lureau 2022-03-29 15:27:12 +04:00
parent 4d14cb0cd7
commit ad24b679d2
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/file-posix.c
View File

@ -1022,6 +1022,21 @@ static int raw_handle_perm_lock(BlockDriverState *bs,
return ret; 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, static int raw_reconfigure_getfd(BlockDriverState *bs, int flags,
int *open_flags, uint64_t perm, bool force_dup, int *open_flags, uint64_t perm, bool force_dup,
Error **errp) Error **errp)

2
include/sysemu/os-posix.h
View File

@ -96,8 +96,6 @@ static inline void qemu_funlockfile(FILE *f)
funlockfile(f); funlockfile(f);
} }
int fcntl_setfl(int fd, int flag);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

15
util/oslib-posix.c
View File

@ -897,21 +897,6 @@ size_t qemu_get_host_physmem(void)
return 0; 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) int qemu_msync(void *addr, size_t length, int fd)
{ {
size_t align_mask = ~(qemu_real_host_page_size() - 1); size_t align_mask = ~(qemu_real_host_page_size() - 1);