From 966857f341d1e5935546a92c5712b637bf64021d Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Thu, 1 Jun 2017 13:17:31 +0200 Subject: [PATCH 08/13] vhost-user: pass message as a pointer to process_message_reply() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Jens Freimann Message-id: <20170601131731.17338-2-jfreiman@redhat.com> Patchwork-id: 75456 O-Subject: [RHV-7.4 qemu-kvm-rhev PATCH 1/1] vhost-user: pass message as a pointer to process_message_reply() Bugzilla: 1447592 RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Xiao Wang RH-Acked-by: Vlad Yasevich RH-Acked-by: Maxime Coquelin From: Maxime Coquelin process_message_reply() was recently updated to get full message content instead of only its request field. There is no need to copy all the struct content into the stack, so just pass its pointer as const. Reviewed-by: Jens Freimann Reviewed-by: Zhiyong Yang Signed-off-by: Maxime Coquelin Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Marc-André Lureau (cherry-picked from commit 60cd11024f41cc73175e651a2dfe09a3cade56bb) This cleans up commit 15a523d "hw/virtio: fix vhost user fails to startup when MQ" Signed-off-by: Jens Freimann Signed-off-by: Miroslav Rezanina --- hw/virtio/vhost-user.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 32a95a8..24ca863 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -163,11 +163,11 @@ fail: } static int process_message_reply(struct vhost_dev *dev, - VhostUserMsg msg) + const VhostUserMsg *msg) { VhostUserMsg msg_reply; - if ((msg.flags & VHOST_USER_NEED_REPLY_MASK) == 0) { + if ((msg->flags & VHOST_USER_NEED_REPLY_MASK) == 0) { return 0; } @@ -175,10 +175,10 @@ static int process_message_reply(struct vhost_dev *dev, return -1; } - if (msg_reply.request != msg.request) { + if (msg_reply.request != msg->request) { error_report("Received unexpected msg type." "Expected %d received %d", - msg.request, msg_reply.request); + msg->request, msg_reply.request); return -1; } @@ -325,7 +325,7 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev, } if (reply_supported) { - return process_message_reply(dev, msg); + return process_message_reply(dev, &msg); } return 0; @@ -717,7 +717,7 @@ static int vhost_user_net_set_mtu(struct vhost_dev *dev, uint16_t mtu) /* If reply_ack supported, slave has to ack specified MTU is valid */ if (reply_supported) { - return process_message_reply(dev, msg); + return process_message_reply(dev, &msg); } return 0; -- 1.8.3.1