From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHj-0005um-C6 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyHh-0002xH-7k for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHh-0002xD-0N for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:25 -0400 Date: Fri, 29 Jul 2016 06:16:22 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-23-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 22/41] vhost: add missing VHOST_OPS_DEBUG List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau From: Marc-Andr=E9 Lureau Add missing VHOST_OPS_DEBUG() logs, for completeness. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1ece1ef..5a29eb3 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -668,6 +668,7 @@ static int vhost_virtqueue_set_addr(struct vhost_dev = *dev, }; int r =3D dev->vhost_ops->vhost_set_vring_addr(dev, &addr); if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_vring_addr failed"); return -errno; } return 0; @@ -681,6 +682,9 @@ static int vhost_dev_set_features(struct vhost_dev *d= ev, bool enable_log) features |=3D 0x1ULL << VHOST_F_LOG_ALL; } r =3D dev->vhost_ops->vhost_set_features(dev, features); + if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_features failed"); + } return r < 0 ? -errno : 0; } =20 @@ -804,6 +808,7 @@ static int vhost_virtqueue_set_vring_endian_legacy(st= ruct vhost_dev *dev, return 0; } =20 + VHOST_OPS_DEBUG("vhost_set_vring_endian failed"); if (errno =3D=3D ENOTTY) { error_report("vhost does not support cross-endian"); return -ENOSYS; @@ -832,12 +837,14 @@ static int vhost_virtqueue_start(struct vhost_dev *= dev, vq->num =3D state.num =3D virtio_queue_get_num(vdev, idx); r =3D dev->vhost_ops->vhost_set_vring_num(dev, &state); if (r) { + VHOST_OPS_DEBUG("vhost_set_vring_num failed"); return -errno; } =20 state.num =3D virtio_queue_get_last_avail_idx(vdev, idx); r =3D dev->vhost_ops->vhost_set_vring_base(dev, &state); if (r) { + VHOST_OPS_DEBUG("vhost_set_vring_base failed"); return -errno; } =20 @@ -889,6 +896,7 @@ static int vhost_virtqueue_start(struct vhost_dev *de= v, file.fd =3D event_notifier_get_fd(virtio_queue_get_host_notifier(vvq= )); r =3D dev->vhost_ops->vhost_set_vring_kick(dev, &file); if (r) { + VHOST_OPS_DEBUG("vhost_set_vring_kick failed"); r =3D -errno; goto fail_kick; } @@ -936,8 +944,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *de= v, =20 r =3D dev->vhost_ops->vhost_get_vring_base(dev, &state); if (r < 0) { - fprintf(stderr, "vhost VQ %d ring restore failed: %d\n", idx, r)= ; - fflush(stderr); + VHOST_OPS_DEBUG("vhost VQ %d ring restore failed: %d", idx, r); } virtio_queue_set_last_avail_idx(vdev, idx, state.num); virtio_queue_invalidate_signalled_used(vdev, idx); @@ -989,6 +996,7 @@ static int vhost_virtqueue_set_busyloop_timeout(struc= t vhost_dev *dev, =20 r =3D dev->vhost_ops->vhost_set_vring_busyloop_timeout(dev, &state); if (r) { + VHOST_OPS_DEBUG("vhost_set_vring_busyloop_timeout failed"); return r; } =20 @@ -1010,6 +1018,7 @@ static int vhost_virtqueue_init(struct vhost_dev *d= ev, file.fd =3D event_notifier_get_fd(&vq->masked_notifier); r =3D dev->vhost_ops->vhost_set_vring_call(dev, &file); if (r) { + VHOST_OPS_DEBUG("vhost_set_vring_call failed"); r =3D -errno; goto fail_call; } @@ -1049,11 +1058,13 @@ int vhost_dev_init(struct vhost_dev *hdev, void *= opaque, =20 r =3D hdev->vhost_ops->vhost_set_owner(hdev); if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_owner failed"); goto fail; } =20 r =3D hdev->vhost_ops->vhost_get_features(hdev, &features); if (r < 0) { + VHOST_OPS_DEBUG("vhost_get_features failed"); goto fail; } =20 @@ -1286,6 +1297,7 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIOD= evice *vdev) } r =3D hdev->vhost_ops->vhost_set_mem_table(hdev, hdev->mem); if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_mem_table failed"); r =3D -errno; goto fail_mem; } @@ -1310,6 +1322,7 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIOD= evice *vdev) hdev->log_size ? log_bas= e : 0, hdev->log); if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_log_base failed"); r =3D -errno; goto fail_log; } --=20 MST