From: Marc-André Lureau Date: Tue, 26 Jul 2016 21:15:09 +0000 (+0400) Subject: vhost-user: call set_msgfds unconditionally X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~6^2~13^2~6^2~75^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df3485a14821edf75b1d3ee6ca38cd80fa989dbf;p=sdk%2Femulator%2Fqemu.git vhost-user: call set_msgfds unconditionally It is fine to call set_msgfds() with 0 fd, and ensures any previous fd array is cleared. Signed-off-by: Marc-André Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 495e09fd4e..f01b92f512 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, VhostUserMsg *msg, return 0; } - if (fd_num) { - qemu_chr_fe_set_msgfds(chr, fds, fd_num); - } + qemu_chr_fe_set_msgfds(chr, fds, fd_num); return qemu_chr_fe_write_all(chr, (const uint8_t *) msg, size) == size ? 0 : -1;