NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: Make it safe to call virFileWrapperFdClose() multiple times

Browse Source 
We'll want to use this function in the cleanup path soon,
and in order to be able to do that we need to make sure we
can call it multiple times on the same virFileWrapperFd
without side effects.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-02-19 16:58:27 +01:00
parent d7be1b1c5e
commit aa60562869
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virfile.c
View File

@ -175,6 +175,7 @@ virFileDirectFdFlag(void)
/* Opaque type for managing a wrapper around a fd. For now, /* Opaque type for managing a wrapper around a fd. For now,
* read-write is not supported, just a single direction. */ * read-write is not supported, just a single direction. */
struct _virFileWrapperFd { struct _virFileWrapperFd {
bool closed; /* Whether virFileWrapperFdClose() has been already called */
virCommandPtr cmd; /* Child iohelper process to do the I/O. */ virCommandPtr cmd; /* Child iohelper process to do the I/O. */
char *err_msg; /* stderr of @cmd */ char *err_msg; /* stderr of @cmd */
}; };
@ -323,16 +324,21 @@ virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED,
* callers can conditionally create a virFileWrapperFd wrapper but * callers can conditionally create a virFileWrapperFd wrapper but
* unconditionally call the cleanup code. To avoid deadlock, only * unconditionally call the cleanup code. To avoid deadlock, only
* call this after closing the fd resulting from virFileWrapperFdNew(). * call this after closing the fd resulting from virFileWrapperFdNew().
*
* This function can be safely called multiple times on the same @wfd.
*/ */
int int
virFileWrapperFdClose(virFileWrapperFdPtr wfd) virFileWrapperFdClose(virFileWrapperFdPtr wfd)
{ {
int ret; int ret;
if (!wfd) if (!wfd || wfd->closed)
return 0; return 0;
ret = virCommandWait(wfd->cmd, NULL); ret = virCommandWait(wfd->cmd, NULL);
wfd->closed = true;
return ret; return ret;
} }