On 12.07.2013 17:38, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
Merge the virCommandPreserveFD / virCommandTransferFD methods into a single virCommandPasFD method, and use a new VIR_COMMAND_PASS_FD_CLOSE_PARENT to indicate their difference in behaviour
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- src/fdstream.c | 3 +- src/libvirt_private.syms | 3 +- src/lxc/lxc_process.c | 6 +- src/qemu/qemu_command.c | 16 +++-- src/uml/uml_conf.c | 3 +- src/util/vircommand.c | 159 ++++++++++++++++++++++------------------------- src/util/vircommand.h | 13 ++-- tests/commandtest.c | 5 +- 8 files changed, 105 insertions(+), 103 deletions(-)
diff --git a/src/util/vircommand.h b/src/util/vircommand.h index a402139..c619e06 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -51,11 +51,14 @@ virCommandPtr virCommandNewVAList(const char *binary, va_list list) * delayed until the Run/RunAsync methods */
-void virCommandPreserveFD(virCommandPtr cmd, - int fd); - -void virCommandTransferFD(virCommandPtr cmd, - int fd); +enum { + /* Close the FD in the parent */ + VIR_COMMAND_PASS_FD_CLOSE_PARENT = (1 << 0), +}; + +void virCommandPassFD(virCommandPtr cmd, + int fd, + unsigned int flags);
You should have updated docs/internals/command.html.in with this change too. Michal