[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 19/32] commit: Fix use of error handling policy
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 19/32] commit: Fix use of error handling policy |
Date: |
Fri, 8 Jul 2016 19:21:31 +0200 |
Commit implemented the 'enospc' policy as 'ignore' if the error was not
ENOSPC. The QAPI documentation promises that it's treated as 'stop'.
Using the common block job error handling function fixes this and also
adds the missing QMP event.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/commit.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 8b534d7..5d11eb6 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -171,9 +171,9 @@ wait:
bytes_written += n * BDRV_SECTOR_SIZE;
}
if (ret < 0) {
- if (s->on_error == BLOCKDEV_ON_ERROR_STOP ||
- s->on_error == BLOCKDEV_ON_ERROR_REPORT||
- (s->on_error == BLOCKDEV_ON_ERROR_ENOSPC && ret == -ENOSPC)) {
+ BlockErrorAction action =
+ block_job_error_action(&s->common, false, s->on_error, -ret);
+ if (action == BLOCK_ERROR_ACTION_REPORT) {
goto out;
} else {
n = 0;
--
1.8.3.1
- [Qemu-block] [PULL 08/32] stream: Add 'job-id' parameter to 'block-stream', (continued)
- [Qemu-block] [PULL 08/32] stream: Add 'job-id' parameter to 'block-stream', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 05/32] blockjob: Add 'job_id' parameter to block_job_create(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 06/32] mirror: Add 'job-id' parameter to 'blockdev-mirror' and 'drive-mirror', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 14/32] coroutine: use QSIMPLEQ instead of QTAILQ, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 09/32] commit: Add 'job-id' parameter to 'block-commit', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 10/32] qemu-img: Set the ID of the block job in img_commit(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 11/32] blockjob: Update description of the 'device' field in the QMP API, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 18/32] block/qdev: Allow configuring WCE with qdev properties, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 17/32] block/qdev: Allow node name for drive properties, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 15/32] test-coroutine: prepare for the next patch, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 19/32] commit: Fix use of error handling policy,
Kevin Wolf <=
[Qemu-block] [PULL 16/32] coroutine: move entry argument to qemu_coroutine_create, Kevin Wolf, 2016/07/08
[Qemu-block] [PULL 20/32] block/qdev: Allow configuring rerror/werror with qdev properties, Kevin Wolf, 2016/07/08
[Qemu-block] [PULL 23/32] qemu-img: Use strerror() for generic resize error, Kevin Wolf, 2016/07/08
[Qemu-block] [PULL 22/32] block: Remove BB options from blockdev-add, Kevin Wolf, 2016/07/08
[Qemu-block] [PULL 21/32] qemu-iotests: Test setting WCE with qdev, Kevin Wolf, 2016/07/08