[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/16] hw/block/nand: Have blk_load() take unsigned offset and ret
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 07/16] hw/block/nand: Have blk_load() take unsigned offset and return boolean |
Date: |
Wed, 10 Apr 2024 11:13:06 +0200 |
Negative offset is meaningless, use unsigned type.
Return a boolean value indicating success.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240409135944.24997-3-philmd@linaro.org>
---
hw/block/nand.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/block/nand.c b/hw/block/nand.c
index f33eb2d552..5a31d78b6b 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -84,7 +84,11 @@ struct NANDFlashState {
void (*blk_write)(NANDFlashState *s);
void (*blk_erase)(NANDFlashState *s);
- void (*blk_load)(NANDFlashState *s, uint64_t addr, int offset);
+ /*
+ * Returns %true when block containing (@addr + @offset) is
+ * successfully loaded, otherwise %false.
+ */
+ bool (*blk_load)(NANDFlashState *s, uint64_t addr, unsigned offset);
uint32_t ioaddr_vmstate;
};
@@ -772,11 +776,11 @@ static void glue(nand_blk_erase_,
NAND_PAGE_SIZE)(NANDFlashState *s)
}
}
-static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s,
- uint64_t addr, int offset)
+static bool glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s,
+ uint64_t addr, unsigned
offset)
{
if (PAGE(addr) >= s->pages) {
- return;
+ return false;
}
if (s->blk) {
@@ -804,6 +808,8 @@ static void glue(nand_blk_load_,
NAND_PAGE_SIZE)(NANDFlashState *s,
offset, NAND_PAGE_SIZE + OOB_SIZE - offset);
s->ioaddr = s->io;
}
+
+ return true;
}
static void glue(nand_init_, NAND_PAGE_SIZE)(NANDFlashState *s)
--
2.41.0
- [PULL 00/16] Misc HW patches for 2024-04-10, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 01/16] hw/virtio: Introduce virtio_bh_new_guarded() helper, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 02/16] hw/display/virtio-gpu: Protect from DMA re-entrancy bugs, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 04/16] hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 03/16] hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 05/16] qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 06/16] hw/block/nand: Factor nand_load_iolen() method out, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 07/16] hw/block/nand: Have blk_load() take unsigned offset and return boolean,
Philippe Mathieu-Daudé <=
- [PULL 08/16] hw/block/nand: Fix out-of-bound access in NAND block buffer, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 09/16] hw/misc/applesmc: Do not call DeviceReset from DeviceRealize, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 10/16] hw/misc/applesmc: Fix memory leak in reset() handler, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 11/16] backends/cryptodev: Do not abort for invalid session ID, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 12/16] hw/net/lan9118: Replace magic '2048' value by MIL_TXFIFO_SIZE definition, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 13/16] hw/net/lan9118: Fix overflow in MIL TX FIFO, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 14/16] hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 16/16] hw/audio/virtio-snd: Remove unused assignment, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 15/16] hw/net/net_tx_pkt: Fix overrun in update_sctp_checksum(), Philippe Mathieu-Daudé, 2024/04/10
- Re: [PULL 00/16] Misc HW patches for 2024-04-10, Peter Maydell, 2024/04/10