Commit 999e5aa5 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Stefan Hajnoczi
Browse files

block: m25p80: Support read only bdrvs. 



By just never doing write-backs. This is completely invisible to the
guest, as the entire storage area is implemented as device state (at
realize time the entire drive is read in).

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent fc1084aa

hw/block/m25p80.c

+2 −6
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void flash_sync_page(Flash *s, int page) 
    int bdrv_sector, nb_sectors;

    QEMUIOVector iov;



    if (!s->bdrv) {

    if (!s->bdrv || bdrv_is_read_only(s->bdrv)) {

        return;

    }
@@ -309,7 +309,7 @@ static inline void flash_sync_area(Flash *s, int64_t off, int64_t len) 
    int64_t start, end, nb_sectors;

    QEMUIOVector iov;



    if (!s->bdrv) {

    if (!s->bdrv || bdrv_is_read_only(s->bdrv)) {

        return;

    }
@@ -627,10 +627,6 @@ static int m25p80_init(SSISlave *ss) 
    if (dinfo && dinfo->bdrv) {

        DB_PRINT_L(0, "Binding to IF_MTD drive\n");

        s->bdrv = dinfo->bdrv;

        if (bdrv_is_read_only(s->bdrv)) {

            fprintf(stderr, "Can't use a read-only drive");

            return 1;

        }



        /* FIXME: Move to late init */

        if (bdrv_read(s->bdrv, 0, s->storage, DIV_ROUND_UP(s->size,