shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

util: introduce virCommandPassFDIndex

Browse Source 
Just like virCommandPassFD, but it also returns an index of
the passed FD in the FD set.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2020-11-24 14:11:36 +01:00
parent 366891533f
commit 49c66026cf
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -1884,6 +1884,7 @@ virCommandNewVAList;
virCommandNonblockingFDs;
virCommandPassFD;
virCommandPassFDGetFDIndex;
virCommandPassFDIndex;
virCommandRawStatus;
virCommandRequireHandshake;
virCommandRun;

28
src/util/vircommand.c
View File

@ -999,10 +999,11 @@ virCommandNewVAList(const char *binary, va_list list)
VIR_FORCE_CLOSE(fd)
/**
* virCommandPassFD:
* virCommandPassFDIndex:
* @cmd: the command to modify
* @fd: fd to reassign to the child
* @flags: extra flags; binary-OR of virCommandPassFDFlags
* @idx: pointer to fill with the index of the FD in the transfer set
*
* Transfer the specified file descriptor to the child, instead
* of closing it on exec. @fd must not be one of the three
@ -1013,7 +1014,7 @@ virCommandNewVAList(const char *binary, va_list list)
* should cease using the @fd when this call completes
*/
void
virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags)
virCommandPassFDIndex(virCommandPtr cmd, int fd, unsigned int flags, size_t *idx)
{
int ret = 0;
@ -1037,6 +1038,29 @@ virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags)
VIR_COMMAND_MAYBE_CLOSE_FD(fd, flags);
return;
}
if (idx)
*idx = cmd->npassfd - 1;
}
/**
* virCommandPassFD:
* @cmd: the command to modify
* @fd: fd to reassign to the child
* @flags: extra flags; binary-OR of virCommandPassFDFlags
*
* Transfer the specified file descriptor to the child, instead
* of closing it on exec. @fd must not be one of the three
* standard streams.
*
* If the flag VIR_COMMAND_PASS_FD_CLOSE_PARENT is set then fd will
* be closed in the parent no later than Run/RunAsync/Free. The parent
* should cease using the @fd when this call completes
*/
void
virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags)
{
virCommandPassFDIndex(cmd, fd, flags, NULL);
}
/*

5
src/util/vircommand.h
View File

@ -57,6 +57,11 @@ void virCommandPassFD(virCommandPtr cmd,
int fd,
unsigned int flags) G_GNUC_NO_INLINE;
void virCommandPassFDIndex(virCommandPtr cmd,
int fd,
unsigned int flags,
size_t *idx) G_GNUC_NO_INLINE;
int virCommandPassFDGetFDIndex(virCommandPtr cmd,
int fd);