diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
| commit | 7f67d8922e2da59c02852de39f888d7873e8645c (patch) | |
| tree | fde41774a54f63bce66a739332c3dbd27365af91 /hw/virtio-blk.c | |
| parent | 27acf660aa1678ff3e7291fa81f4d5d4020b20f8 (diff) | |
| parent | 6e0ca8820dddd04056c43327f3b3699f572d03d4 (diff) | |
| download | focaccia-qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.gz focaccia-qemu-7f67d8922e2da59c02852de39f888d7873e8645c.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'hw/virtio-blk.c')
| -rw-r--r-- | hw/virtio-blk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index c2ee0001eb..daa8e42be7 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -77,7 +77,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, req->next = s->rq; s->rq = req; bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read); - vm_stop(VMSTOP_DISKFULL); + vm_stop(RSTATE_IO_ERROR); } else { virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); bdrv_acct_done(s->bs, &req->acct); @@ -439,7 +439,8 @@ static void virtio_blk_dma_restart_bh(void *opaque) virtio_submit_multiwrite(s->bs, &mrb); } -static void virtio_blk_dma_restart_cb(void *opaque, int running, int reason) +static void virtio_blk_dma_restart_cb(void *opaque, int running, + RunState state) { VirtIOBlock *s = opaque; |