diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-02-25 12:06:58 -0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-08 11:30:01 -0600 |
| commit | 554a310bfe319a56de9d768efdb252115129d2a5 (patch) | |
| tree | b96781b970241a3a47dfed717fec7c303d61ed47 /hw | |
| parent | 93d67ee69d6104976961fbc98654872de28a5c96 (diff) | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/core.c | 2 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 2 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 2e0971ddeb..67480bbba9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -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); diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index bf7efc0bbe..522f521649 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -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); diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index b80402d0fd..8939bb2529 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -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); |