[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/12] pc-bios/s390-ccw/virtio-blkdev: Request the right feature
From: |
Thomas Huth |
Subject: |
[PATCH 10/12] pc-bios/s390-ccw/virtio-blkdev: Request the right feature bits |
Date: |
Tue, 28 Jun 2022 15:10:30 +0200 |
The virtio-blk code uses the block size and geometry fields in the
config area. According to the virtio-spec, these have to be negotiated
with the right feature bits during initialization, otherwise they
might not be available. QEMU is so far very forgiving and always
provides them, but we should not rely on this behavior, so let's
better request them properly via the VIRTIO_BLK_F_GEOMETRY and
VIRTIO_BLK_F_BLK_SIZE feature bits.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/virtio-blkdev.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c
index a2b157b2c0..96cb18c72c 100644
--- a/pc-bios/s390-ccw/virtio-blkdev.c
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
@@ -13,6 +13,9 @@
#include "virtio.h"
#include "virtio-scsi.h"
+#define VIRTIO_BLK_F_GEOMETRY (1 << 4)
+#define VIRTIO_BLK_F_BLK_SIZE (1 << 6)
+
static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr,
int sec_num)
{
@@ -223,6 +226,7 @@ int virtio_blk_setup_device(SubChannelId schid)
{
VDev *vdev = virtio_get_device();
+ vdev->guest_features[0] = VIRTIO_BLK_F_GEOMETRY | VIRTIO_BLK_F_BLK_SIZE;
vdev->schid = schid;
virtio_setup_ccw(vdev);
--
2.31.1
- [PATCH 02/12] pc-bios/s390-ccw/virtio: Introduce a macro for the DASD block size, (continued)
- [PATCH 02/12] pc-bios/s390-ccw/virtio: Introduce a macro for the DASD block size, Thomas Huth, 2022/06/28
- [PATCH 05/12] pc-bios/s390-ccw/virtio-blkdev: Remove virtio_assume_scsi(), Thomas Huth, 2022/06/28
- [PATCH 04/12] pc-bios/s390-ccw/virtio-blkdev: Simplify/fix virtio_ipl_disk_is_valid(), Thomas Huth, 2022/06/28
- [PATCH 06/12] pc-bios/s390-ccw/virtio: Set missing status bits while initializing, Thomas Huth, 2022/06/28
- [PATCH 07/12] pc-bios/s390-ccw/virtio: Read device config after feature negotiation, Thomas Huth, 2022/06/28
- [PATCH 08/12] pc-bios/s390-ccw/virtio: Beautify the code for reading virtqueue configuration, Thomas Huth, 2022/06/28
- [PATCH 09/12] pc-bios/s390-ccw: Split virtio-scsi code from virtio_blk_setup_device(), Thomas Huth, 2022/06/28
- [PATCH 10/12] pc-bios/s390-ccw/virtio-blkdev: Request the right feature bits,
Thomas Huth <=
- [PATCH 11/12] pc-bios/s390-ccw/virtio: Remove "extern" keyword from prototypes, Thomas Huth, 2022/06/28
- [PATCH 12/12] pc-bios/s390-ccw/netboot.mak: Ignore Clang's warnings about GNU extensions, Thomas Huth, 2022/06/28