Merge remote-tracking branch 'kwolf/for-anthony' into staging

1 files changed, 2 insertions, 0 deletions

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 534b186f6f..280a117fe2 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -529,6 +529,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op)
         s->bus->error_status = op;
         bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
         vm_stop(RUN_STATE_IO_ERROR);
+        bdrv_iostatus_set_err(s->bs, error);
     } else {
         if (op & BM_STATUS_DMA_RETRY) {
             dma_buf_commit(s, 0);
@@ -1873,6 +1874,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind,
     }
 
     ide_reset(s);
+    bdrv_iostatus_enable(bs);
     return 0;
 }