Markus Armbruster <arm...@redhat.com> writes:
> When a guest tries to abort "write to buffer" (command 0xE8), we print
> "PFLASH: Possible BUG - Write block confirm", then exit(1). Letting
> the guest terminate QEMU is not a good idea. Instead, LOG_UNIMP we
> screwed up, then reset the device.
>
> Macro PFLASH_BUG() is now unused; delete it.
>
> Suggested-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> hw/block/pflash_cfi01.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
> index a51ac9f399..e6d933a06d 100644
> --- a/hw/block/pflash_cfi01.c
> +++ b/hw/block/pflash_cfi01.c
> @@ -49,12 +49,6 @@
> #include "sysemu/sysemu.h"
> #include "trace.h"
>
> -#define PFLASH_BUG(fmt, ...) \
> -do { \
> - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \
> - exit(1); \
> -} while(0)
> -
> /* #define PFLASH_DEBUG */
> #ifdef PFLASH_DEBUG
> #define DPRINTF(fmt, ...) \
> @@ -623,8 +617,11 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
> pfl->wcycle = 0;
> pfl->status |= 0x80;
> } else {
> - DPRINTF("%s: unknown command for \"write block\"\n",
> __func__);
> - PFLASH_BUG("Write block confirm");
> + qemu_log_mask(LOG_UNIMP,
> + "%s: Aborting write to buffer not implemented,"
> + " the data is already written to storage!\n"
> + "Flash device reset into READ mode.\n",
> + __func__);
> goto reset_flash;
> }
> break;
--
Alex Bennée
