[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/41] vhost-user: add error report in vhost_user_wri
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 38/41] vhost-user: add error report in vhost_user_write() |
Date: |
Fri, 29 Jul 2016 06:17:19 +0300 |
From: Marc-André Lureau <address@hidden>
Similar to vhost_user_read() error report, it is useful to have early
error report.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost-user.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 819481d..1995fd2 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -176,7 +176,7 @@ static int vhost_user_write(struct vhost_dev *dev,
VhostUserMsg *msg,
int *fds, int fd_num)
{
CharDriverState *chr = dev->opaque;
- int size = VHOST_USER_HDR_SIZE + msg->size;
+ int ret, size = VHOST_USER_HDR_SIZE + msg->size;
/*
* For non-vring specific requests, like VHOST_USER_SET_MEM_TABLE,
@@ -188,11 +188,18 @@ static int vhost_user_write(struct vhost_dev *dev,
VhostUserMsg *msg,
}
if (qemu_chr_fe_set_msgfds(chr, fds, fd_num) < 0) {
+ error_report("Failed to set msg fds.");
return -1;
}
- return qemu_chr_fe_write_all(chr, (const uint8_t *) msg, size) == size ?
- 0 : -1;
+ ret = qemu_chr_fe_write_all(chr, (const uint8_t *) msg, size);
+ if (ret != size) {
+ error_report("Failed to write msg."
+ " Wrote %d instead of %d.", ret, size);
+ return -1;
+ }
+
+ return 0;
}
static int vhost_user_set_log_base(struct vhost_dev *dev, uint64_t base,
--
MST
- [Qemu-devel] [PULL 28/41] vhost-user: keep vhost_net after a disconnection, (continued)
- [Qemu-devel] [PULL 28/41] vhost-user: keep vhost_net after a disconnection, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 29/41] vhost-user: add get_vhost_net() assertions, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 30/41] Revert "vhost-net: do not crash if backend is not present", Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 31/41] vhost-net: vhost_migration_done is vhost-user specific, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 32/41] vhost: add assert() to check runtime behaviour, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 33/41] char: add chr_wait_connected callback, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is completed, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 34/41] char: add and use tcp_chr_wait_connected, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 36/41] tests: plug some leaks in virtio-net-test, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 37/41] tests: fix vhost-user-test leak, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 38/41] vhost-user: add error report in vhost_user_write(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 39/41] vhost: add vhost_net_set_backend(), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 41/41] mptsas: Fix a migration compatible issue, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 40/41] vhost: do not update last avail idx on get_vring_base() failure, Michael S. Tsirkin, 2016/07/28
- Re: [Qemu-devel] [PULL 00/41] pc, pci, virtio: cleanups, fixes, Peter Maydell, 2016/07/29