SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qemu/osdep: Move close_all_open_fds() to oslib-posix

Browse Source 
Move close_all_open_fds() in oslib-posix, rename it
qemu_close_all_open_fds() and export it.

Signed-off-by: Clément Léger <cleger@rivosinc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240802145423.3232974-2-cleger@rivosinc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Clément Léger 2024-08-02 16:54:17 +02:00 committed by Richard Henderson
parent 5b0c2742c8
commit 4ec5ebea07
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/qemu/osdep.h
View File

@ -757,6 +757,13 @@ static inline void qemu_reset_optind(void)
int qemu_fdatasync(int fd); int qemu_fdatasync(int fd);
/**
* qemu_close_all_open_fd:
*
* Close all open file descriptors
*/
void qemu_close_all_open_fd(void);
/** /**
* Sync changes made to the memory mapped file back to the backing * Sync changes made to the memory mapped file back to the backing
* storage. For POSIX compliant systems this will fallback * storage. For POSIX compliant systems this will fallback

37
system/async-teardown.c
View File

@ -26,40 +26,6 @@
static pid_t the_ppid; static pid_t the_ppid;
/*
* Close all open file descriptors.
*/
static void close_all_open_fd(void)
{
struct dirent *de;
int fd, dfd;
DIR *dir;
#ifdef CONFIG_CLOSE_RANGE
int r = close_range(0, ~0U, 0);
if (!r) {
/* Success, no need to try other ways. */
return;
}
#endif
dir = opendir("/proc/self/fd");
if (!dir) {
/* If /proc is not mounted, there is nothing that can be done. */
return;
}
/* Avoid closing the directory. */
dfd = dirfd(dir);
for (de = readdir(dir); de; de = readdir(dir)) {
fd = atoi(de->d_name);
if (fd != dfd) {
close(fd);
}
}
closedir(dir);
}
static void hup_handler(int signal) static void hup_handler(int signal)
{ {
/* Check every second if this process has been reparented. */ /* Check every second if this process has been reparented. */
@ -85,9 +51,8 @@ static int async_teardown_fn(void *arg)
/* /*
* Close all file descriptors that might have been inherited from the * Close all file descriptors that might have been inherited from the
* main qemu process when doing clone, needed to make libvirt happy. * main qemu process when doing clone, needed to make libvirt happy.
* Not using close_range for increased compatibility with older kernels.
*/ */
close_all_open_fd(); qemu_close_all_open_fd();
/* Set up a handler for SIGHUP and unblock SIGHUP. */ /* Set up a handler for SIGHUP and unblock SIGHUP. */
sigaction(SIGHUP, &sa, NULL); sigaction(SIGHUP, &sa, NULL);

34
util/oslib-posix.c
View File

@ -807,3 +807,37 @@ int qemu_msync(void *addr, size_t length, int fd)
return msync(addr, length, MS_SYNC); return msync(addr, length, MS_SYNC);
} }
/*
* Close all open file descriptors.
*/
void qemu_close_all_open_fd(void)
{
struct dirent *de;
int fd, dfd;
DIR *dir;
#ifdef CONFIG_CLOSE_RANGE
int r = close_range(0, ~0U, 0);
if (!r) {
/* Success, no need to try other ways. */
return;
}
#endif
dir = opendir("/proc/self/fd");
if (!dir) {
/* If /proc is not mounted, there is nothing that can be done. */
return;
}
/* Avoid closing the directory. */
dfd = dirfd(dir);
for (de = readdir(dir); de; de = readdir(dir)) {
fd = atoi(de->d_name);
if (fd != dfd) {
close(fd);
}
}
closedir(dir);
}