69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From f6ad6b772dce72042afbe8779cd9c52d5e352418 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Mon, 15 Mar 2021 18:16:24 -0400
|
|
Subject: [PATCH 08/15] vhost-user-blk: fix blkcfg->num_queues endianness
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-id: <20210315181629.212884-2-stefanha@redhat.com>
|
|
Patchwork-id: 101338
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH 1/6] vhost-user-blk: fix blkcfg->num_queues endianness
|
|
Bugzilla: 1937004
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
|
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>
|
|
(cherry picked from commit 535255b43898d2e96744057eb86f8497d4d7a461)
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@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.27.0
|
|
|