motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-02 06:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move fcntl_setfl() to oslib-posix

Browse source 
It is only implemented for POSIX anyway.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220323155743.1585078-30-marcandre.lureau@redhat.com>
[Add braces around if statements. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-03-23 19:57:40 +04:00 • committed by Paolo Bonzini
parent 69242e7e7e
commit e9c4e0a8e5
4 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/qemu/cutils.h
View file

@ -131,7 +131,6 @@ const char *qemu_strchrnul(const char *s, int c);
time_t mktimegm(struct tm *tm); time_t mktimegm(struct tm *tm);
int qemu_fdatasync(int fd); int qemu_fdatasync(int fd);
int qemu_msync(void *addr, size_t length, int fd); int qemu_msync(void *addr, size_t length, int fd);
int fcntl_setfl(int fd, int flag);
int qemu_parse_fd(const char *param); int qemu_parse_fd(const char *param);
int qemu_strtoi(const char *nptr, const char **endptr, int base, int qemu_strtoi(const char *nptr, const char **endptr, int base,
int *result); int *result);

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

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

17
util/cutils.c
View file

@ -199,23 +199,6 @@ int qemu_msync(void *addr, size_t length, int fd)
#endif /* CONFIG_POSIX */ #endif /* CONFIG_POSIX */
} }
#ifndef _WIN32
/* 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;
}
#endif
static int64_t suffix_mul(char suffix, int64_t unit) static int64_t suffix_mul(char suffix, int64_t unit)
{ {
switch (qemu_toupper(suffix)) { switch (qemu_toupper(suffix)) {

15
util/oslib-posix.c
View file

@ -936,3 +936,18 @@ size_t qemu_get_host_physmem(void)
#endif #endif
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;
}