Re: [Qemu-devel] [PATCH 09/22] 9pfs: remove dead code

[Greg Kurz]

On Thu, 07 Jan 2016 22:11:11 +0530
"Aneesh Kumar K.V" <address@hidden> wrote:

> Wei Liu <address@hidden> writes:
> 
> > Some structures virtio-9p.h have been unused since 2011 when relevant
> > functions switched to use coroutines.
> >
> > The declaration of pdu_packunpack and function do_pdu_unpack are
> > useless.
> >
> > The function virtio_9p_set_fd_limit is unused.
> >
> > Signed-off-by: Wei Liu <address@hidden>
> > ---
> >  hw/9pfs/virtio-9p.c | 11 ---------
> >  hw/9pfs/virtio-9p.h | 68 
> > -----------------------------------------------------
> >  2 files changed, 79 deletions(-)
> >
> > diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
> > index 30ff828..084fa6a 100644
> > --- a/hw/9pfs/virtio-9p.c
> > +++ b/hw/9pfs/virtio-9p.c
> > @@ -3287,14 +3287,3 @@ void handle_9p_output(VirtIODevice *vdev, VirtQueue 
> > *vq)
> >      }
> >      free_pdu(s, pdu);
> >  }
> > -
> > -static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void)
> > -{
> > -    struct rlimit rlim;
> > -    if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
> > -        fprintf(stderr, "Failed to get the resource limit\n");
> > -        exit(1);
> > -    }
> > -    open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur/3);
> > -    open_fd_rc = rlim.rlim_cur/2;
> > -}
> 
> I am looking at when we stopped using that. We still do file descriptor
> reclaim. If we do that we need to set the open_fd_hw/rc.
> 

Indeed this function has no explicit caller but it is not dead code. We
must keep it.

Wei, no need to repost, I'll fix this in my tree.

> 
> 
> > diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
> > index ac4cb00..3c78d3c 100644
> > --- a/hw/9pfs/virtio-9p.h
> > +++ b/hw/9pfs/virtio-9p.h
> > @@ -227,65 +227,6 @@ typedef struct V9fsState
> >      V9fsConf fsconf;
> >2.1.4
> 
> -aneesh

Thanks Aneesh !

--
Greg