From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZguE3-0003lB-EY for qemu-devel@nongnu.org; Tue, 29 Sep 2015 08:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZguDx-0003my-M1 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 08:41:43 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:41701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZguDx-0003mf-2o for qemu-devel@nongnu.org; Tue, 29 Sep 2015 08:41:37 -0400 References: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> <1443094669-4144-7-git-send-email-marcandre.lureau@redhat.com> From: Claudio Fontana Message-ID: <560A86FA.1090102@huawei.com> Date: Tue, 29 Sep 2015 14:41:30 +0200 MIME-Version: 1.0 In-Reply-To: <1443094669-4144-7-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 06/47] ivshmem: remove unnecessary dup() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: pbonzini@redhat.com, drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com On 24.09.2015 13:37, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > qemu_chr_fe_get_msgfd() transfers ownership, there is no need to dup the > fd. > > Signed-off-by: Marc-André Lureau > --- > hw/misc/ivshmem.c | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index dd15f0e..fbeb731 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -480,7 +480,7 @@ static bool fifo_update_and_get(IVShmemState *s, const uint8_t *buf, int size, > static void ivshmem_read(void *opaque, const uint8_t *buf, int size) > { > IVShmemState *s = opaque; > - int incoming_fd, tmp_fd; > + int incoming_fd; > int guest_max_eventfd; > long incoming_posn; > > @@ -495,21 +495,21 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) > } > > /* pick off s->server_chr->msgfd and store it, posn should accompany msg */ > - tmp_fd = qemu_chr_fe_get_msgfd(s->server_chr); > - IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, tmp_fd); > + incoming_fd = qemu_chr_fe_get_msgfd(s->server_chr); > + IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, incoming_fd); > > /* make sure we have enough space for this guest */ > if (incoming_posn >= s->nb_peers) { > if (increase_dynamic_storage(s, incoming_posn) < 0) { > error_report("increase_dynamic_storage() failed"); > - if (tmp_fd != -1) { > - close(tmp_fd); > + if (incoming_fd != -1) { > + close(incoming_fd); > } > return; > } > } > > - if (tmp_fd == -1) { > + if (incoming_fd == -1) { > /* if posn is positive and unseen before then this is our posn*/ > if ((incoming_posn >= 0) && > (s->peers[incoming_posn].eventfds == NULL)) { > @@ -524,15 +524,6 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) > } > } > > - /* because of the implementation of get_msgfd, we need a dup */ > - incoming_fd = dup(tmp_fd); > - > - if (incoming_fd == -1) { > - error_report("could not allocate file descriptor %s", strerror(errno)); > - close(tmp_fd); > - return; > - } > - > /* if the position is -1, then it's shared memory region fd */ > if (incoming_posn == -1) { > > Reviewed-by: Claudio Fontana