From abd7f68d081ef5adb425f659c7449149987bf89e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 2 Jun 2010 18:55:17 +0200 Subject: block: Move error actions from DriveInfo to BlockDriverState That's where they belong semantically (block device host part), even though the actions are actually executed by guest device code. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/virtio-blk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'hw/virtio-blk.c') diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 4cc94f60e5..75878ebe3c 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -58,8 +58,7 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, int is_read) { - BlockInterfaceErrorAction action = - drive_get_on_error(req->dev->bs, is_read); + BlockErrorAction action = bdrv_get_on_error(req->dev->bs, is_read); VirtIOBlock *s = req->dev; if (action == BLOCK_ERR_IGNORE) { -- cgit 1.4.1