From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDXyb-0007dS-HK for qemu-devel@nongnu.org; Thu, 16 Jun 2016 10:09:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDXyW-0000Kr-36 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 10:08:56 -0400 From: Kevin Wolf Date: Thu, 16 Jun 2016 16:07:57 +0200 Message-Id: <1466086108-24868-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1466086108-24868-1-git-send-email-kwolf@redhat.com> References: <1466086108-24868-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/39] m25p80: fix test on blk_pread() return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: C=C3=A9dric Le Goater commit 243e6f69c129 ("m25p80: Switch to byte-based block access") replaced blk_read() calls with blk_pread() but return values are different. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- hw/block/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 4c856f5..51d8596 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -900,7 +900,7 @@ static int m25p80_init(SSISlave *ss) s->storage =3D blk_blockalign(s->blk, s->size); =20 /* FIXME: Move to late init */ - if (blk_pread(s->blk, 0, s->storage, s->size)) { + if (blk_pread(s->blk, 0, s->storage, s->size) !=3D s->size) { fprintf(stderr, "Failed to initialize SPI flash!\n"); return 1; } --=20 1.8.3.1