[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/29] vhost: use error_report() instead of fprin
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v4 11/29] vhost: use error_report() instead of fprintf(stderr, ...) |
Date: |
Thu, 7 Jul 2016 03:00:35 +0200 |
From: Marc-André Lureau <address@hidden>
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é Lureau <address@hidden>
---
hw/virtio/vhost.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index dd03900..6b4ddef 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -427,11 +427,11 @@ static int vhost_verify_ring_mappings(struct vhost_dev
*dev,
l = vq->ring_size;
p = cpu_physical_memory_map(vq->ring_phys, &l, 1);
if (!p || l != 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 = -ENOMEM;
}
if (p != vq->ring) {
- fprintf(stderr, "Ring buffer relocated for ring %d\n", i);
+ error_report("Ring buffer relocated for ring %d", i);
r = -EBUSY;
}
cpu_physical_memory_unmap(p, l, 0, 0);
@@ -928,8 +928,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev,
r = 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);
+ error_report("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);
@@ -1014,8 +1013,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
}
if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev)) {
- 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 = -1;
goto fail;
}
@@ -1121,8 +1120,9 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev,
VirtIODevice *vdev)
VirtioBusState *vbus = VIRTIO_BUS(qbus);
VirtioBusClass *k = 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 = -ENOSYS;
goto fail;
}
@@ -1131,7 +1131,7 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev,
VirtIODevice *vdev)
r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + 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;
}
}
@@ -1142,8 +1142,7 @@ fail_vq:
e = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + 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 >= 0);
}
@@ -1165,8 +1164,7 @@ void vhost_dev_disable_notifiers(struct vhost_dev *hdev,
VirtIODevice *vdev)
r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + 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 >= 0);
}
--
2.9.0
- [Qemu-devel] [PATCH v4 01/29] misc: indentation, (continued)
- [Qemu-devel] [PATCH v4 01/29] misc: indentation, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 03/29] vhost: don't assume opaque is a fd, use backend cleanup, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 02/29] vhost-user: minor simplification, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 04/29] vhost: make vhost_log_put() idempotent, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 05/29] vhost: assert the log was cleaned up, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 06/29] vhost: fix cleanup on not fully initialized device, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 08/29] vhost-net: always call vhost_dev_cleanup() on failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 09/29] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 07/29] vhost: make vhost_dev_cleanup() idempotent, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 10/29] vhost: do not assert() on vhost_ops failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 11/29] vhost: use error_report() instead of fprintf(stderr, ...),
marcandre . lureau <=
- [Qemu-devel] [PATCH v4 12/29] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 15/29] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 14/29] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 13/29] vhost-user: call set_msgfds unconditionally, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 17/29] vhost-user: add get_vhost_net() assertions, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 16/29] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 18/29] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 19/29] vhost-net: vhost_migration_done is vhost-user specific, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 20/29] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 22/29] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/06