Re: [PATCH V1 16/32] oslib: add qemu_clr_cloexec

[Dr. David Alan Gilbert]

* Steve Sistare (steven.sistare@oracle.com) wrote:
> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>

Seems same as set, so:

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  include/qemu/osdep.h | 1 +
>  util/oslib-posix.c   | 9 +++++++++
>  util/oslib-win32.c   | 4 ++++
>  3 files changed, 14 insertions(+)
> 
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index 45c217a..bb28df1 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -551,6 +551,7 @@ static inline void qemu_timersub(const struct timeval 
> *val1,
>  #endif
>  
>  void qemu_set_cloexec(int fd);
> +void qemu_clr_cloexec(int fd);
>  
>  /* Starting on QEMU 2.5, qemu_hw_version() returns "2.5+" by default
>   * instead of QEMU_VERSION, so setting hw_version on MachineClass
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index d923674..28fee45 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -314,6 +314,15 @@ void qemu_set_cloexec(int fd)
>      assert(f != -1);
>  }
>  
> +void qemu_clr_cloexec(int fd)
> +{
> +    int f;
> +    f = fcntl(fd, F_GETFD);
> +    assert(f != -1);
> +    f = fcntl(fd, F_SETFD, f & ~FD_CLOEXEC);
> +    assert(f != -1);
> +}
> +
>  /*
>   * Creates a pipe with FD_CLOEXEC set on both file descriptors
>   */
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index 7eedbe5..e5d0c7c 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -254,6 +254,10 @@ void qemu_set_cloexec(int fd)
>  {
>  }
>  
> +void qemu_clr_cloexec(int fd)
> +{
> +}
> +
>  /* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
>  #define _W32_FT_OFFSET (116444736000000000ULL)
>  
> -- 
> 1.8.3.1
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK