summaryrefslogtreecommitdiffstats
path: root/hw/ide/core.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-10-14 12:36:50 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-10-14 12:36:50 -0500
commit2a22e6eb1b516a16ed2dd6c15da9a1e5b3455371 (patch)
tree25929b08103e952a07a6bfb4f6676ab957b835e0 /hw/ide/core.c
parent210b3a70383b0bcc4266856431491b39dcb4f14d (diff)
parent09f085d59dcca7cccc76a22ad4e5cc70e3ff2bdd (diff)
downloadhqemu-2a22e6eb1b516a16ed2dd6c15da9a1e5b3455371.zip
hqemu-2a22e6eb1b516a16ed2dd6c15da9a1e5b3455371.tar.gz
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/ide/core.c')
-rw-r--r--hw/ide/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 534b186..280a117 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;
}
OpenPOWER on IntegriCloud