From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lEy-0005aN-V1 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lEs-0003SS-7y for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:14:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lEr-0003S3-W0 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:14:46 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:17:45 +0100 Message-Id: <1330528688-21996-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 04/27] fdc: handle read-only floppies (abort early on write commands) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Herv=C3=A9 Poussineau A real floppy doesn't attempt to write to read-only media either. Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 9d1f5b3..3d4bb11 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -300,6 +300,7 @@ enum { }; =20 enum { + FD_SR1_NW =3D 0x02, /* Not writable */ FD_SR1_EC =3D 0x80, /* End of cylinder */ }; =20 @@ -1179,6 +1180,16 @@ static int fdctrl_transfer_handler (void *opaque, = int nchan, break; case FD_DIR_WRITE: /* WRITE commands */ + if (cur_drv->ro) { + /* Handle readonly medium early, no need to do DMA, touc= h the + * LED or attempt any writes. A real floppy doesn't atte= mpt + * to write to readonly media either. */ + fdctrl_stop_transfer(fdctrl, + FD_SR0_ABNTERM | FD_SR0_SEEK, FD_SR= 1_NW, + 0x00); + goto transfer_error; + } + DMA_read_memory (nchan, fdctrl->fifo + rel_pos, fdctrl->data_pos, len); if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), --=20 1.7.6.5