From 38150be860434de9d9c76cef71ff5c6b6112ee8f Mon Sep 17 00:00:00 2001 From: Maxim Samoylov Date: Mon, 12 Oct 2015 17:50:20 +0200 Subject: pc-bios/s390-ccw: Always adjust virtio sector count Let's always adjust the sector number to be read using the current virtio block size value. This prepares for the implementation of IPL from ISO-9660 media. Signed-off-by: Maxim Samoylov Reviewed-by: David Hildenbrand Reviewed-by: Cornelia Huck Signed-off-by: Cornelia Huck --- pc-bios/s390-ccw/virtio.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index c23466b8db..76c42f119d 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -199,14 +199,9 @@ extern int virtio_read_many(ulong sector, void *load_addr, int sec_num); #define VIRTIO_SECTOR_SIZE 512 -static inline ulong virtio_eckd_sector_adjust(ulong sector) -{ - return sector * (virtio_get_block_size() / VIRTIO_SECTOR_SIZE); -} - static inline ulong virtio_sector_adjust(ulong sector) { - return virtio_disk_is_eckd() ? virtio_eckd_sector_adjust(sector) : sector; + return sector * (virtio_get_block_size() / VIRTIO_SECTOR_SIZE); } #endif /* VIRTIO_H */ -- cgit v1.2.3