Re: [Qemu-block] [PATCH 1/2] osdep: Introduce qemu_dup

[Fam Zheng]

On Wed, 06/22 14:27, Kevin Wolf wrote:
> > diff --git a/util/osdep.c b/util/osdep.c
> > index ff004e8..c746e9f 100644
> > --- a/util/osdep.c
> > +++ b/util/osdep.c
> > @@ -83,14 +83,7 @@ static int qemu_dup_flags(int fd, int flags)
> >      int serrno;
> >      int dup_flags;
> >  
> > -#ifdef F_DUPFD_CLOEXEC
> > -    ret = fcntl(fd, F_DUPFD_CLOEXEC, 0);
> > -#else
> > -    ret = dup(fd);
> > -    if (ret != -1) {
> > -        qemu_set_cloexec(ret);
> > -    }
> > -#endif
> > +    ret = qemu_dup(fd);
> >      if (ret == -1) {
> >          goto fail;
> >      }
> > @@ -129,6 +122,20 @@ fail:
> >      return -1;
> >  }
> >  
> > +int qemu_dup(int fd)
> > +{
> > +    int r;
> 
> Why the rename? (Not necessarily objecting, just curious.)

Obviously I should have copied from qemu_dup_flags instead of
raw_reopen_prepare. :(

> 
> > +#ifdef F_DUPFD_CLOEXEC
> > +    r = fcntl(fd, F_DUPFD_CLOEXEC, 0);
> > +#else
> > +    r = dup(fd);
> > +    if (r != -1) {
> > +        qemu_set_cloexec(raw_s->fd);
> 
> This won't compile.

Will fix.

Fam