motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Anthony Liguori 2011-10-14 12:36:50 -05:00
commit 2a22e6eb1b
12 changed files with 285 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/ide/core.c
View file

@ -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;
}