From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8oRM-000262-FV for qemu-devel@nongnu.org; Fri, 03 Jun 2016 08:43:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8oRK-0002fx-Ft for qemu-devel@nongnu.org; Fri, 03 Jun 2016 08:43:03 -0400 References: <1464931021-25117-1-git-send-email-mark.cave-ayland@ilande.co.uk> From: Eric Blake Message-ID: <57517B4E.6010606@redhat.com> Date: Fri, 3 Jun 2016 06:42:54 -0600 MIME-Version: 1.0 In-Reply-To: <1464931021-25117-1-git-send-email-mark.cave-ayland@ilande.co.uk> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eiuuirFKFou38trXGrD6lwGeLH2lAvoRX" Subject: Re: [Qemu-devel] [PATCH] scsi-disk: fix reads from scsi-disk devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Cave-Ayland , qemu-devel@nongnu.org, qemu-block@nongnu.org, pbonzini@redhat.com, zxq_yx_007@163.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eiuuirFKFou38trXGrD6lwGeLH2lAvoRX Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 06/02/2016 11:17 PM, Mark Cave-Ayland wrote: > Commit fcaafb1001b9c42817714dd3b2aadcfdb997b53d accidentally broke read= s from > scsi-disk devices when being updated from its original form to use the = new > byte-based block functions. Add the extra missing sector to offset conv= ersion > in order to restore read functionality. >=20 > Signed-off-by: Mark Cave-Ayland > --- > hw/scsi/scsi-disk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake >=20 > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index ace65e0..ab7cf9c 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -347,7 +347,7 @@ static void scsi_do_read(SCSIDiskReq *r, int ret) > scsi_init_iovec(r, SCSI_DMA_BUF_SIZE); > block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, > r->qiov.size, BLOCK_ACCT_READ); > - r->req.aiocb =3D sdc->dma_readv(r->sector, &r->qiov, > + r->req.aiocb =3D sdc->dma_readv(r->sector << BDRV_SECTOR_BITS,= &r->qiov, > scsi_read_complete, r, r); > } > =20 >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --eiuuirFKFou38trXGrD6lwGeLH2lAvoRX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXUXtOAAoJEKeha0olJ0Nq6AYH/iw5kt2SnFKoUOKRLBM+waHN JW/Kh5F2XLlVkuEoOWBdIRQ6xyNIV9faarpQQ7+WeTJGb5ShEWz+jRenh1GEuMnj wAnNPr6E+iBIVMMLuwLar8d3JSgXGyEw+/FPj02klU4hH6pRnuOa4jz6KDhZuw94 sJhsU58L0pIVp8uToRzR7k2zSWRjIL4GfIwgx9FhnnfflypWF4ZrHn6TjImG/rqL 6HHZXMI8qPbGn9tFfh1BZB5oxGBLDPckQN3nm/BcOXbJoknWQYZBfzVnouDMkatc /Ww41AUFlPcx0IvtxYqJSquuHFjPyWasrV/o6VN9dQ83DgjFuJ+4n+DRKlvM3Y4= =2w/Y -----END PGP SIGNATURE----- --eiuuirFKFou38trXGrD6lwGeLH2lAvoRX--