[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 06/11] vhost-user: split vhost_user_read()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 06/11] vhost-user: split vhost_user_read() |
Date: |
Mon, 26 Nov 2018 16:42:45 +0400 |
Split vhost_user_read(), so only header can be read with
vhost_user_read_header().
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
hw/virtio/vhost-user.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 0131bbb0fc..9256364e30 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -210,7 +210,7 @@ static bool ioeventfd_enabled(void)
return kvm_enabled() && kvm_eventfds_enabled();
}
-static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg)
+static int vhost_user_read_header(struct vhost_dev *dev, VhostUserMsg *msg)
{
struct vhost_user *u = dev->opaque;
CharBackend *chr = u->user->chr;
@@ -221,7 +221,7 @@ static int vhost_user_read(struct vhost_dev *dev,
VhostUserMsg *msg)
if (r != size) {
error_report("Failed to read msg header. Read %d instead of %d."
" Original request %d.", r, size, msg->hdr.request);
- goto fail;
+ return -1;
}
/* validate received flags */
@@ -229,7 +229,21 @@ static int vhost_user_read(struct vhost_dev *dev,
VhostUserMsg *msg)
error_report("Failed to read msg header."
" Flags 0x%x instead of 0x%x.", msg->hdr.flags,
VHOST_USER_REPLY_MASK | VHOST_USER_VERSION);
- goto fail;
+ return -1;
+ }
+
+ return 0;
+}
+
+static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg)
+{
+ struct vhost_user *u = dev->opaque;
+ CharBackend *chr = u->user->chr;
+ uint8_t *p = (uint8_t *) msg;
+ int r, size;
+
+ if (vhost_user_read_header(dev, msg) < 0) {
+ return -1;
}
/* validate message size is sane */
@@ -237,7 +251,7 @@ static int vhost_user_read(struct vhost_dev *dev,
VhostUserMsg *msg)
error_report("Failed to read msg header."
" Size %d exceeds the maximum %zu.", msg->hdr.size,
VHOST_USER_PAYLOAD_SIZE);
- goto fail;
+ return -1;
}
if (msg->hdr.size) {
@@ -247,14 +261,11 @@ static int vhost_user_read(struct vhost_dev *dev,
VhostUserMsg *msg)
if (r != size) {
error_report("Failed to read msg payload."
" Read %d instead of %d.", r, msg->hdr.size);
- goto fail;
+ return -1;
}
}
return 0;
-
-fail:
- return -1;
}
static int process_message_reply(struct vhost_dev *dev,
--
2.20.0.rc1
- [Qemu-devel] [PATCH for-3.2 00/11] vhost-user-backend & vhost-user-input, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 01/11] vhost-user: define conventions for vhost-user backends, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 02/11] vhost-user: simplify vhost_user_init/vhost_user_cleanup, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 03/11] libvhost-user: exit by default on VHOST_USER_NONE, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 04/11] vhost-user: wrap some read/write with retry handling, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 05/11] Add vhost-user-backend, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 06/11] vhost-user: split vhost_user_read(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 07/11] vhost-user: add vhost_user_input_get_config(), Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 08/11] libvhost-user-glib: export vug_source_new(), Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 09/11] libvhost-user: add vu_queue_unpop(), Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 10/11] Add vhost-user-input-pci, Marc-André Lureau, 2018/11/26
- [Qemu-devel] [PATCH for-3.2 11/11] contrib: add vhost-user-input, Marc-André Lureau, 2018/11/26