diff options
| author | Thomas Huth | 2022-07-04 13:18:53 +0200 |
|---|---|---|
| committer | Thomas Huth | 2022-07-06 18:33:36 +0200 |
| commit | 1f2c2ee48e87ea743f8e23cc7569dd26c4cf9623 (patch) | |
| tree | 9eb26ea591698f027d2b0768c055cc9c49b90f44 | |
| parent | pc-bios/s390-ccw: Add a proper prototype for main() (diff) | |
| download | qemu-1f2c2ee48e87ea743f8e23cc7569dd26c4cf9623.tar.gz qemu-1f2c2ee48e87ea743f8e23cc7569dd26c4cf9623.tar.xz qemu-1f2c2ee48e87ea743f8e23cc7569dd26c4cf9623.zip | |
pc-bios/s390-ccw/virtio: Introduce a macro for the DASD block size
Use VIRTIO_DASD_DEFAULT_BLOCK_SIZE instead of the magic value 4096.
Message-Id: <20220704111903.62400-3-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | pc-bios/s390-ccw/virtio-blkdev.c | 2 | ||||
| -rw-r--r-- | pc-bios/s390-ccw/virtio.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c index 7d35050292..6483307630 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -155,7 +155,7 @@ void virtio_assume_eckd(void) vdev->config.blk.physical_block_exp = 0; switch (vdev->senseid.cu_model) { case VIRTIO_ID_BLOCK: - vdev->config.blk.blk_size = 4096; + vdev->config.blk.blk_size = VIRTIO_DASD_DEFAULT_BLOCK_SIZE; break; case VIRTIO_ID_SCSI: vdev->config.blk.blk_size = vdev->scsi_block_size; diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index 19fceb6495..9e410bde6f 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -198,6 +198,7 @@ extern int virtio_read_many(ulong sector, void *load_addr, int sec_num); #define VIRTIO_SECTOR_SIZE 512 #define VIRTIO_ISO_BLOCK_SIZE 2048 #define VIRTIO_SCSI_BLOCK_SIZE 512 +#define VIRTIO_DASD_DEFAULT_BLOCK_SIZE 4096 static inline ulong virtio_sector_adjust(ulong sector) { |