From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axcUN-0007jU-TK for qemu-devel@nongnu.org; Tue, 03 May 2016 11:44:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axcUC-0006zD-DN for qemu-devel@nongnu.org; Tue, 03 May 2016 11:43:50 -0400 From: Eric Blake Date: Tue, 3 May 2016 09:42:39 -0600 Message-Id: <1462290166-32584-8-git-send-email-eblake@redhat.com> In-Reply-To: <1462290166-32584-1-git-send-email-eblake@redhat.com> References: <1462290166-32584-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v5 07/14] m25p80: 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, kwolf@redhat.com, Peter Crosthwaite , Max Reitz Sector-based blk_read() should die; switch to byte-based blk_pread() instead. Signed-off-by: Eric Blake --- v5: compile tested this time --- hw/block/m25p80.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 906b712..01c51a2 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -907,8 +907,7 @@ static int m25p80_init(SSISlave *ss) s->storage = blk_blockalign(s->blk, s->size); /* FIXME: Move to late init */ - if (blk_read(s->blk, 0, s->storage, - DIV_ROUND_UP(s->size, BDRV_SECTOR_SIZE))) { + if (blk_pread(s->blk, 0, s->storage, s->size)) { fprintf(stderr, "Failed to initialize SPI flash!\n"); return 1; } -- 2.5.5