From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz0bI-0002Cv-RP for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:31:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz0bD-0004XS-Ph for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:31:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz0bD-0004XK-IJ for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:31:39 -0400 From: Stefan Hajnoczi Date: Mon, 23 Jun 2014 17:31:15 +0800 Message-Id: <1403515879-14359-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1403515879-14359-1-git-send-email-stefanha@redhat.com> References: <1403515879-14359-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 2/6] block: m25p80: Support read only bdrvs. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Stefan Hajnoczi From: Peter Crosthwaite 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: Peter Crosthwaite Signed-off-by: Stefan Hajnoczi --- hw/block/m25p80.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index e4ef733..5893773 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -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, -- 1.9.3