From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9oX-0000O3-Lb for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:58:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQ9oW-0007Sl-Kr for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:58:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9oW-0007Sb-FV for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:58:40 -0400 From: marcandre.lureau@redhat.com Date: Thu, 21 Jul 2016 12:57:33 +0400 Message-Id: <20160721085750.30008-15-marcandre.lureau@redhat.com> In-Reply-To: <20160721085750.30008-1-marcandre.lureau@redhat.com> References: <20160721085750.30008-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 14/31] vhost-user: call set_msgfds unconditionally List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mukawa@igel.co.jp, yuanhan.liu@linux.intel.com, victork@redhat.com, jonshin@cisco.com, mst@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau It is fine to call set_msgfds() with 0 fd, and ensures any previous fd array is cleared. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/vhost-user.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 495e09f..f01b92f 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -187,9 +187,7 @@ static int vhost_user_write(struct vhost_dev *dev, Vh= ostUserMsg *msg, return 0; } =20 - if (fd_num) { - qemu_chr_fe_set_msgfds(chr, fds, fd_num); - } + qemu_chr_fe_set_msgfds(chr, fds, fd_num); =20 return qemu_chr_fe_write_all(chr, (const uint8_t *) msg, size) =3D=3D= size ? 0 : -1; --=20 2.9.0