[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 08/39] m25p80: fix test on blk_pread() return value
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 08/39] m25p80: fix test on blk_pread() return value |
Date: |
Thu, 16 Jun 2016 16:07:57 +0200 |
From: Cédric Le Goater <address@hidden>
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édric Le Goater <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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 = blk_blockalign(s->blk, s->size);
/* 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) != s->size) {
fprintf(stderr, "Failed to initialize SPI flash!\n");
return 1;
}
--
1.8.3.1
- [Qemu-block] [PULL 00/39] Block layer patches, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 04/39] qcow2: Use bytes instead of sectors for QCowL2Meta, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 01/39] qcow2: Work with bytes in qcow2_get_cluster_offset(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 02/39] qcow2: Implement .bdrv_co_preadv(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 08/39] m25p80: fix test on blk_pread() return value,
Kevin Wolf <=
- [Qemu-block] [PULL 03/39] qcow2: Make copy_sectors() byte based, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 05/39] qcow2: Implement .bdrv_co_pwritev(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 09/39] qemu-img bench: Fix uninitialised writethrough mode, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 07/39] hmp: acquire aio_context in hmp_qemu_io, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 06/39] blockdev: clarify error on attempt to open locked tray, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 14/39] block: Prepare bdrv_aligned_preadv() for byte-aligned requests, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 13/39] block: Byte-based bdrv_co_do_copy_on_readv(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 12/39] block: drop support for using qcow[2] encryption with system emulators, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 16/39] raw-posix: Switch to bdrv_co_* interfaces, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 23/39] block: Allow .bdrv_load/save_vmstate() to return 0/-errno, Kevin Wolf, 2016/06/16