52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Date: Tue, 23 Feb 2021 14:46:42 +0000
|
||
|
|
Subject: vhost-user-blk: fix blkcfg->num_queues endianness
|
||
|
|
|
||
|
|
Git-commit: 535255b43898d2e96744057eb86f8497d4d7a461
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Message-Id: <20210223144653.811468-2-stefanha@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 2dd3d93ca02f077b9fe8aaaa4d14..d9d9dc8a890d9d24b772c029e57f 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:
|