[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/12] vhost-user-blk: fix blkcfg->num_queues endianness
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v2 01/12] vhost-user-blk: fix blkcfg->num_queues endianness |
Date: |
Mon, 7 Dec 2020 17:20:19 +0000 |
Treat the num_queues field as virtio-endian. On big-endian hosts the
vhost-user-blk num_queues field was in the wrong endianness.
Move the blkcfg.num_queues store operation from realize to
vhost_user_blk_update_config() so feature negotiation has finished and
we know the endianness of the device. VIRTIO 1.0 devices are
little-endian, but in case someone wants to use legacy VIRTIO we support
all endianness cases.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/block/vhost-user-blk.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 2dd3d93ca0..d9d9dc8a89 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -53,6 +53,9 @@ static void vhost_user_blk_update_config(VirtIODevice *vdev,
uint8_t *config)
{
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ /* Our num_queues overrides the device backend */
+ virtio_stw_p(vdev, &s->blkcfg.num_queues, s->num_queues);
+
memcpy(config, &s->blkcfg, sizeof(struct virtio_blk_config));
}
@@ -490,10 +493,6 @@ reconnect:
goto reconnect;
}
- if (s->blkcfg.num_queues != s->num_queues) {
- s->blkcfg.num_queues = s->num_queues;
- }
-
return;
virtio_err:
--
2.28.0
- [PATCH v2 00/12] block/export: vhost-user-blk server tests and input validation, Stefan Hajnoczi, 2020/12/07
- [PATCH v2 04/12] libqtest: add qtest_remove_abrt_handler(), Stefan Hajnoczi, 2020/12/07
- [PATCH v2 01/12] vhost-user-blk: fix blkcfg->num_queues endianness,
Stefan Hajnoczi <=
- [PATCH v2 12/12] block/export: port virtio-blk read/write range check, Stefan Hajnoczi, 2020/12/07
- [PATCH v2 06/12] tests/qtest: add multi-queue test case to vhost-user-blk-test, Stefan Hajnoczi, 2020/12/07
- [PATCH v2 03/12] libqtest: add qtest_kill_qemu(), Stefan Hajnoczi, 2020/12/07
- [PATCH v2 11/12] vhost-user-blk-test: test discard/write zeroes invalid inputs, Stefan Hajnoczi, 2020/12/07
- [PATCH v2 02/12] libqtest: add qtest_socket_server(), Stefan Hajnoczi, 2020/12/07
- [PATCH v2 05/12] test: new qTest case to test the vhost-user-blk-server, Stefan Hajnoczi, 2020/12/07
- [PATCH v2 10/12] block/export: port virtio-blk discard/write zeroes input validation, Stefan Hajnoczi, 2020/12/07
- [PATCH v2 07/12] block/export: fix blk_size double byteswap, Stefan Hajnoczi, 2020/12/07