sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

block: Emit BLOCK_IO_ERROR before vm_stop() call 

The next commit will move the STOP event into do_vm_stop(), to
have the expected event sequence we need to emit the I/O error
event before calling vm_stop().

The expected sequence is:

{ "event": "BLOCK_IO_ERROR" [...] }
{ "event": "STOP" }

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2010-02-25 12:06:58 -03:00 committed by Anthony Liguori
parent 93d67ee69d
commit 554a310bfe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ide/core.c
View File

@ -491,8 +491,8 @@ static int ide_handle_rw_error(IDEState *s, int error, int op)
|| action == BLOCK_ERR_STOP_ANY) {
s->bus->bmdma->unit = s->unit;
s->bus->bmdma->status |= op;
vm_stop(0);
bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
vm_stop(0);
} else {
if (op & BM_STATUS_DMA_RETRY) {
dma_buf_commit(s, 0);

2
hw/scsi-disk.c
View File

@ -190,8 +190,8 @@ static int scsi_handle_write_error(SCSIDiskReq *r, int error)
if ((error == ENOSPC && action == BLOCK_ERR_STOP_ENOSPC)
|| action == BLOCK_ERR_STOP_ANY) {
r->status |= SCSI_REQ_STATUS_RETRY;
vm_stop(0);
bdrv_mon_event(s->bs, BDRV_ACTION_STOP, 0);
vm_stop(0);
} else {
scsi_command_complete(r, CHECK_CONDITION,
HARDWARE_ERROR);

2
hw/virtio-blk.c
View File

@ -72,8 +72,8 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error,
|| action == BLOCK_ERR_STOP_ANY) {
req->next = s->rq;
s->rq = req;
vm_stop(0);
bdrv_mon_event(req->dev->bs, BDRV_ACTION_STOP, is_read);
vm_stop(0);
} else {
virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);
bdrv_mon_event(req->dev->bs, BDRV_ACTION_REPORT, is_read);