[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT d0e7605] Check block driver read error in pflash_
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT d0e7605] Check block driver read error in pflash_cfi0x |
Date: |
Fri, 28 Aug 2009 02:20:02 -0000 |
From: Vijay Kumar <address@hidden>
If a flash file of size smaller than the flash size is specified in
the -pflash option, the block driver returns error. But the
pflash_cfi0x ignores the error. This results in a flash content of all
zeroes. And the simulation aborts while executing code.
This patch adds the checks for errors from bdrv_read and escalates it
to the calling code.
Signed-off-by: Vijay Kumar B. <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 6dd39a6..cef9ffb 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -507,6 +507,7 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
ram_addr_t off,
{
pflash_t *pfl;
target_phys_addr_t total_len;
+ int ret;
total_len = sector_len * nb_blocs;
@@ -530,7 +531,12 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
ram_addr_t off,
pfl->bs = bs;
if (pfl->bs) {
/* read the initial flash content */
- bdrv_read(pfl->bs, 0, pfl->storage, total_len >> 9);
+ ret = bdrv_read(pfl->bs, 0, pfl->storage, total_len >> 9);
+ if (ret < 0) {
+ cpu_unregister_io_memory(pfl->fl_mem);
+ qemu_free(pfl);
+ return NULL;
+ }
}
#if 0 /* XXX: there should be a bit to set up read-only,
* the same way the hardware does (with WP pin).
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index a97b9e6..7f5094b 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -547,6 +547,7 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base,
ram_addr_t off,
{
pflash_t *pfl;
int32_t chip_len;
+ int ret;
chip_len = sector_len * nb_blocs;
/* XXX: to be fixed */
@@ -568,7 +569,12 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base,
ram_addr_t off,
pfl->bs = bs;
if (pfl->bs) {
/* read the initial flash content */
- bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9);
+ ret = bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9);
+ if (ret < 0) {
+ cpu_unregister_io_memory(pfl->fl_mem);
+ qemu_free(pfl);
+ return NULL;
+ }
}
#if 0 /* XXX: there should be a bit to set up read-only,
* the same way the hardware does (with WP pin).
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT d0e7605] Check block driver read error in pflash_cfi0x,
Anthony Liguori <=