From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwZdl-00065K-Kf for qemu-devel@nongnu.org; Wed, 11 Nov 2015 12:57:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwZdS-0004je-Fy for qemu-devel@nongnu.org; Wed, 11 Nov 2015 12:57:01 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:33700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwZdS-0004j3-5w for qemu-devel@nongnu.org; Wed, 11 Nov 2015 12:56:42 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 Nov 2015 17:56:41 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 558EC17D8042 for ; Wed, 11 Nov 2015 17:56:57 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tABHucEZ66519266 for ; Wed, 11 Nov 2015 17:56:38 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tABGucAJ014954 for ; Wed, 11 Nov 2015 09:56:39 -0700 From: Cornelia Huck Date: Wed, 11 Nov 2015 18:56:25 +0100 Message-Id: <1447264593-14625-8-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1447264593-14625-1-git-send-email-cornelia.huck@de.ibm.com> References: <1447264593-14625-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL for-2.5 07/15] pc-bios/s390-ccw: Always adjust virtio sector count List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Maxim Samoylov , Cornelia Huck From: Maxim Samoylov 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 c23466b..76c42f1 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 */ -- 2.6.3