[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/12] libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply
From: |
Michael S. Tsirkin |
Subject: |
[PULL 07/12] libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply |
Date: |
Tue, 28 Jun 2022 00:42:46 -0400 |
From: Kevin Wolf <kwolf@redhat.com>
With REPLY_NEEDED, libvhost-user sends both the acutal result and an
additional ACK reply for VHOST_USER_GET_MAX_MEM_SLOTS. This is
incorrect, the spec mandates that it behave the same with and without
REPLY_NEEDED because it always sends a reply.
Fixes: 6fb2e173d20c9bbb5466183d33a3ad7dcd0375fa
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220627134500.94842-3-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
subprojects/libvhost-user/libvhost-user.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/subprojects/libvhost-user/libvhost-user.c
b/subprojects/libvhost-user/libvhost-user.c
index b4cc3c2d68..cfa1bcc334 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -1827,18 +1827,11 @@ vu_handle_vring_kick(VuDev *dev, VhostUserMsg *vmsg)
static bool vu_handle_get_max_memslots(VuDev *dev, VhostUserMsg *vmsg)
{
- vmsg->flags = VHOST_USER_REPLY_MASK | VHOST_USER_VERSION;
- vmsg->size = sizeof(vmsg->payload.u64);
- vmsg->payload.u64 = VHOST_USER_MAX_RAM_SLOTS;
- vmsg->fd_num = 0;
-
- if (!vu_message_write(dev, dev->sock, vmsg)) {
- vu_panic(dev, "Failed to send max ram slots: %s\n", strerror(errno));
- }
+ vmsg_set_reply_u64(vmsg, VHOST_USER_MAX_RAM_SLOTS);
DPRINT("u64: 0x%016"PRIx64"\n", (uint64_t) VHOST_USER_MAX_RAM_SLOTS);
- return false;
+ return true;
}
static bool
--
MST
- [PULL 00/12] virtio: fixes, Michael S. Tsirkin, 2022/06/28
- [PULL 02/12] msi: fix MSI vector limit check in msi_set_mask(), Michael S. Tsirkin, 2022/06/28
- [PULL 03/12] vhost: add method vhost_set_vring_err, Michael S. Tsirkin, 2022/06/28
- [PULL 04/12] vhost: setup error eventfd and dump errors, Michael S. Tsirkin, 2022/06/28
- [PULL 01/12] virtio-iommu: Fix the partial copy of probe request, Michael S. Tsirkin, 2022/06/28
- [PULL 05/12] virtio-iommu: Fix migration regression, Michael S. Tsirkin, 2022/06/28
- [PULL 06/12] docs/vhost-user: Fix mismerge, Michael S. Tsirkin, 2022/06/28
- [PULL 07/12] libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply,
Michael S. Tsirkin <=
- [PULL 09/12] MAINTAINERS: Collect memory device files in "Memory devices", Michael S. Tsirkin, 2022/06/28
- [PULL 11/12] include/hw/virtio: document vhost_get_features, Michael S. Tsirkin, 2022/06/28
- [PULL 12/12] include/hw/virtio: document vhost_ack_features, Michael S. Tsirkin, 2022/06/28
- [PULL 10/12] contrib/vhost-user-blk: fix 32 bit build and enable, Michael S. Tsirkin, 2022/06/28
- [PULL 08/12] libvhost-user: Fix VHOST_USER_ADD_MEM_REG reply, Michael S. Tsirkin, 2022/06/28
- Re: [PULL 00/12] virtio: fixes, Richard Henderson, 2022/06/28