~dannf/qemu-linaro/qemu-highbank-ppa

« back to all changes in this revision

Viewing changes to hw/virtio-blk.c

  • Committer: Steve Langasek
  • Date: 2012-03-15 21:13:19 UTC
  • mfrom: (0.1.15)
  • Revision ID: steve.langasek@canonical.com-20120315211319-f1j3ot1ihx30b2s9
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
69
69
    VirtIOBlock *s = req->dev;
70
70
 
71
71
    if (action == BLOCK_ERR_IGNORE) {
72
 
        bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
 
72
        bdrv_emit_qmp_error_event(s->bs, BDRV_ACTION_IGNORE, is_read);
73
73
        return 0;
74
74
    }
75
75
 
77
77
            || action == BLOCK_ERR_STOP_ANY) {
78
78
        req->next = s->rq;
79
79
        s->rq = req;
80
 
        bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
 
80
        bdrv_emit_qmp_error_event(s->bs, BDRV_ACTION_STOP, is_read);
81
81
        vm_stop(RUN_STATE_IO_ERROR);
82
82
        bdrv_iostatus_set_err(s->bs, error);
83
83
    } else {
84
84
        virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);
85
85
        bdrv_acct_done(s->bs, &req->acct);
86
86
        g_free(req);
87
 
        bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
 
87
        bdrv_emit_qmp_error_event(s->bs, BDRV_ACTION_REPORT, is_read);
88
88
    }
89
89
 
90
90
    return 1;