From: Eric Farman Date: Wed, 10 May 2017 15:53:52 +0000 (+0200) Subject: pc-bios/s390-ccw: Remove duplicate blk_factor adjustment X-Git-Tag: v2.10.0-rc0~175^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77c76392b0e3c613730ef5932348c3156c3de60f;p=thirdparty%2Fqemu.git pc-bios/s390-ccw: Remove duplicate blk_factor adjustment When using virtio-scsi, we multiply the READ(10) data_size by a block factor twice when building the I/O. This is fine, since it's only 1 for SCSI disks, but let's clean it up. Signed-off-by: Eric Farman Reviewed-by: Christian Borntraeger Message-Id: <20170510155359.32727-2-farman@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck --- diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c index d850a8deed5..69b7a93b29b 100644 --- a/pc-bios/s390-ccw/virtio-scsi.c +++ b/pc-bios/s390-ccw/virtio-scsi.c @@ -154,7 +154,7 @@ static bool scsi_read_10(VDev *vdev, VirtioCmd read_10[] = { { &req, sizeof(req), VRING_DESC_F_NEXT }, { &resp, sizeof(resp), VRING_DESC_F_WRITE | VRING_DESC_F_NEXT }, - { data, data_size * f, VRING_DESC_F_WRITE }, + { data, data_size, VRING_DESC_F_WRITE }, }; debug_print_int("read_10 sector", sector);