Proposed patch:
$ git diff hw/block/ diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 3636874432..13a9470d19 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1429,7 +1429,9 @@ static void fdctrl_write_dor(FDCtrl *fdctrl, uint32_t value) } } /* Selected drive */ - fdctrl->cur_drv = value & FD_DOR_SELMASK; + if (fdctrl->drives[value & FD_DOR_SELMASK].blk) { + fdctrl->cur_drv = value & FD_DOR_SELMASK; + }
fdctrl->dor = value; } @@ -1894,6 +1896,10 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) uint32_t pos;
cur_drv = get_cur_drv(fdctrl); + if (!cur_drv->blk) { + FLOPPY_DPRINTF("No drive connected\n"); + return 0; + } fdctrl->dsr &= ~FD_DSR_PWRDOWN; if (!(fdctrl->msr & FD_MSR_RQM) || !(fdctrl->msr & FD_MSR_DIO)) { FLOPPY_DPRINTF("error: controller not ready for reading\n"); @@ -2420,7 +2426,8 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) if (pos == FD_SECTOR_LEN - 1 || fdctrl->data_pos == fdctrl->data_len) { cur_drv = get_cur_drv(fdctrl); - if (blk_pwrite(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, + if (cur_drv->blk == NULL + || blk_pwrite(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, BDRV_SECTOR_SIZE, 0) < 0) { FLOPPY_DPRINTF("error writing sector %d\n", fd_sector(cur_drv));
Proposed patch:
$ git diff hw/block/ .13a9470d19 100644 write_dor( FDCtrl *fdctrl, uint32_t value) >drives[ value & FD_DOR_ SELMASK] .blk) {
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 3636874432.
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -1429,7 +1429,9 @@ static void fdctrl_
}
}
/* Selected drive */
- fdctrl->cur_drv = value & FD_DOR_SELMASK;
+ if (fdctrl-
+ fdctrl->cur_drv = value & FD_DOR_SELMASK;
+ }
fdctrl->dor = value; read_data( FDCtrl *fdctrl)
}
@@ -1894,6 +1896,10 @@ static uint32_t fdctrl_
uint32_t pos;
cur_drv = get_cur_ drv(fdctrl) ;
FLOPPY_ DPRINTF( "error: controller not ready for reading\n"); write_data( FDCtrl *fdctrl, uint32_t value)
fdctrl- >data_pos == fdctrl->data_len) {
cur_ drv = get_cur_ drv(fdctrl) ; cur_drv- >blk, fd_offset(cur_drv), fdctrl->fifo, cur_drv- >blk, fd_offset(cur_drv), fdctrl->fifo,
BDRV_SECTOR_ SIZE, 0) < 0) {
FLOPPY_ DPRINTF( "error writing sector %d\n",
fd_ sector( cur_drv) );
+ if (!cur_drv->blk) {
+ FLOPPY_DPRINTF("No drive connected\n");
+ return 0;
+ }
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
if (!(fdctrl->msr & FD_MSR_RQM) || !(fdctrl->msr & FD_MSR_DIO)) {
@@ -2420,7 +2426,8 @@ static void fdctrl_
if (pos == FD_SECTOR_LEN - 1 ||
- if (blk_pwrite(
+ if (cur_drv->blk == NULL
+ || blk_pwrite(