Commit 2d93bebf authored by Markus Armbruster's avatar Markus Armbruster
Browse files

pflash_cfi01: Do not exit() on guest aborting "write to buffer" 



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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-Id: <20190308094610.21210-3-armbru@redhat.com>
parent 16434065

hw/block/pflash_cfi01.c

+5 −8
Original line number Diff line number Diff line
@@ -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;