From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHm-0005vu-Qe for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyHk-000302-L2 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHk-0002zx-Cm for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:28 -0400 Date: Fri, 29 Jul 2016 06:16:25 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-24-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 23/41] vhost: use error_report() instead of fprintf(stderr, ...) 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 Let's use qemu proper error reporting API, this ensures the error is reported at the right place (stderr or monitor), with a conventional format. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 5a29eb3..bb886f3 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -439,11 +439,11 @@ static int vhost_verify_ring_mappings(struct vhost_= dev *dev, l =3D vq->ring_size; p =3D cpu_physical_memory_map(vq->ring_phys, &l, 1); if (!p || l !=3D vq->ring_size) { - fprintf(stderr, "Unable to map ring buffer for ring %d\n", i= ); + error_report("Unable to map ring buffer for ring %d", i); r =3D -ENOMEM; } if (p !=3D vq->ring) { - fprintf(stderr, "Ring buffer relocated for ring %d\n", i); + error_report("Ring buffer relocated for ring %d", i); r =3D -EBUSY; } cpu_physical_memory_unmap(p, l, 0, 0); @@ -1050,8 +1050,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *op= aque, } =20 if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hd= ev)) { - fprintf(stderr, "vhost backend memory slots limit is less" - " than current number of present memory slots\n"); + error_report("vhost backend memory slots limit is less" + " than current number of present memory slots"); r =3D -1; goto fail; } @@ -1174,8 +1174,9 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hd= ev, VirtIODevice *vdev) VirtioBusState *vbus =3D VIRTIO_BUS(qbus); VirtioBusClass *k =3D VIRTIO_BUS_GET_CLASS(vbus); int i, r, e; + if (!k->ioeventfd_started) { - fprintf(stderr, "binding does not support host notifiers\n"); + error_report("binding does not support host notifiers"); r =3D -ENOSYS; goto fail; } @@ -1184,7 +1185,7 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hd= ev, VirtIODevice *vdev) r =3D virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_in= dex + i, true); if (r < 0) { - fprintf(stderr, "vhost VQ %d notifier binding failed: %d\n",= i, -r); + error_report("vhost VQ %d notifier binding failed: %d", i, -= r); goto fail_vq; } } @@ -1195,8 +1196,7 @@ fail_vq: e =3D virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_in= dex + i, false); if (e < 0) { - fprintf(stderr, "vhost VQ %d notifier cleanup error: %d\n", = i, -r); - fflush(stderr); + error_report("vhost VQ %d notifier cleanup error: %d", i, -r= ); } assert (e >=3D 0); } @@ -1218,8 +1218,7 @@ void vhost_dev_disable_notifiers(struct vhost_dev *= hdev, VirtIODevice *vdev) r =3D virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_in= dex + i, false); if (r < 0) { - fprintf(stderr, "vhost VQ %d notifier cleanup failed: %d\n",= i, -r); - fflush(stderr); + error_report("vhost VQ %d notifier cleanup failed: %d", i, -= r); } assert (r >=3D 0); } --=20 MST