ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhost: use error_report() instead of fprintf(stderr,...) 

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 <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-27 01:15:07 +04:00 committed by Michael S. Tsirkin
parent c640969216
commit 4afba63120
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/virtio/vhost.c
View File

@ -439,11 +439,11 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
l = vq->ring_size; l = vq->ring_size;
p = cpu_physical_memory_map(vq->ring_phys, &l, 1); p = cpu_physical_memory_map(vq->ring_phys, &l, 1);
if (!p || l != vq->ring_size) { 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; r = -ENOMEM;
} }
if (p != vq->ring) { 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; r = -EBUSY;
} }
cpu_physical_memory_unmap(p, l, 0, 0); cpu_physical_memory_unmap(p, l, 0, 0);
@ -1050,8 +1050,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
} }
if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev)) { if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev)) {
fprintf(stderr, "vhost backend memory slots limit is less" error_report("vhost backend memory slots limit is less"
" than current number of present memory slots\n"); " than current number of present memory slots");
r = -1; r = -1;
goto fail; goto fail;
} }
@ -1174,8 +1174,9 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev)
VirtioBusState *vbus = VIRTIO_BUS(qbus); VirtioBusState *vbus = VIRTIO_BUS(qbus);
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus);
int i, r, e; int i, r, e;
if (!k->ioeventfd_started) { if (!k->ioeventfd_started) {
fprintf(stderr, "binding does not support host notifiers\n"); error_report("binding does not support host notifiers");
r = -ENOSYS; r = -ENOSYS;
goto fail; goto fail;
} }
@ -1184,7 +1185,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, r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i,
true); true);
if (r < 0) { 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; goto fail_vq;
} }
} }
@ -1195,8 +1196,7 @@ fail_vq:
e = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i, e = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i,
false); false);
if (e < 0) { if (e < 0) {
fprintf(stderr, "vhost VQ %d notifier cleanup error: %d\n", i, -r); error_report("vhost VQ %d notifier cleanup error: %d", i, -r);
fflush(stderr);
} }
assert (e >= 0); assert (e >= 0);
} }
@ -1218,8 +1218,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, r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i,
false); false);
if (r < 0) { if (r < 0) {
fprintf(stderr, "vhost VQ %d notifier cleanup failed: %d\n", i, -r); error_report("vhost VQ %d notifier cleanup failed: %d", i, -r);
fflush(stderr);
} }
assert (r >= 0); assert (r >= 0);
} }