From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkhb-0003mo-VD for qemu-devel@nongnu.org; Fri, 22 Apr 2016 19:41:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atkha-0005Oa-To for qemu-devel@nongnu.org; Fri, 22 Apr 2016 19:41:35 -0400 From: Eric Blake Date: Fri, 22 Apr 2016 17:40:24 -0600 Message-Id: <1461368452-10389-17-git-send-email-eblake@redhat.com> In-Reply-To: <1461368452-10389-1-git-send-email-eblake@redhat.com> References: <1461368452-10389-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v3 16/44] atapi: Switch to byte-based block access List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, alex@alex.org.uk, John Snow Sector-based blk_read() should die; switch to byte-based blk_pread() instead. Signed-off-by: Eric Blake --- hw/ide/atapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 2bb606c..81000d8 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -119,12 +119,12 @@ cd_read_sector_sync(IDEState *s) switch (s->cd_sector_size) { case 2048: - ret = blk_read(s->blk, (int64_t)s->lba << 2, - s->io_buffer, 4); + ret = blk_pread(s->blk, (int64_t)s->lba << (2 + BDRV_SECTOR_BITS), + s->io_buffer, 4 << BDRV_SECTOR_BITS); break; case 2352: - ret = blk_read(s->blk, (int64_t)s->lba << 2, - s->io_buffer + 16, 4); + ret = blk_pread(s->blk, (int64_t)s->lba << (2 + BDRV_SECTOR_BITS), + s->io_buffer + 16, 4 << BDRV_SECTOR_BITS); if (ret >= 0) { cd_data_to_raw(s->io_buffer, s->lba); } -- 2.5.5