diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-10-19 17:53:22 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-23 18:18:23 +0200 |
| commit | 373340b26caa1572cf0f155131569dfc527aa133 (patch) | |
| tree | fe453b08000c1d5c59402c0e74c675825c0335be /block/commit.c | |
| parent | 7f0e9da6f134c5303be51333696e1ff54697f3e0 (diff) | |
| download | focaccia-qemu-373340b26caa1572cf0f155131569dfc527aa133.tar.gz focaccia-qemu-373340b26caa1572cf0f155131569dfc527aa133.zip | |
block: Move I/O status and error actions into BB
These options are only relevant for the user of a whole BDS tree (like a guest device or a block job) and should thus be moved into the BlockBackend. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/commit.c')
| -rw-r--r-- | block/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/commit.c b/block/commit.c index d12e26fab6..fdebe87c16 100644 --- a/block/commit.c +++ b/block/commit.c @@ -17,6 +17,7 @@ #include "block/blockjob.h" #include "qapi/qmp/qerror.h" #include "qemu/ratelimit.h" +#include "sysemu/block-backend.h" enum { /* @@ -213,7 +214,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, if ((on_error == BLOCKDEV_ON_ERROR_STOP || on_error == BLOCKDEV_ON_ERROR_ENOSPC) && - !bdrv_iostatus_is_enabled(bs)) { + (!bs->blk || !blk_iostatus_is_enabled(bs->blk))) { error_setg(errp, "Invalid parameter combination"); return; } |