From patchwork Tue Jul 24 11:03:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [12/47] block: sort BlockDeviceIoStatus errors by severity From: Paolo Bonzini X-Patchwork-Id: 172871 Message-Id: <1343127865-16608-13-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com Date: Tue, 24 Jul 2012 13:03:50 +0200 This does not let a "failed" (EIO) status override a "nospace" status. When several concurrent asynchronous operations fail, management will always observe the most severe condition. Signed-off-by: Paolo Bonzini --- block.c | 11 ++++++++--- qapi-schema.json | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 333a8fd..dce07b3 100644 --- a/block.c +++ b/block.c @@ -3883,9 +3883,14 @@ void bdrv_iostatus_reset(BlockDriverState *bs) void bdrv_iostatus_set_err(BlockDriverState *bs, int error) { assert(bdrv_iostatus_is_enabled(bs)); - if (bs->iostatus == BLOCK_DEVICE_IO_STATUS_OK) { - bs->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE : - BLOCK_DEVICE_IO_STATUS_FAILED; + BlockDeviceIoStatus new_status = + (error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE : + BLOCK_DEVICE_IO_STATUS_FAILED); + + /* iostatus values are sorted from less severe to most severe + * (ok, nospace, failed). */ + if (bs->iostatus < new_status) { + bs->iostatus = new_status; } } diff --git a/qapi-schema.json b/qapi-schema.json index 136ce5e..2dee7c3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -435,7 +435,7 @@ # # Since: 1.0 ## -{ 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] } +{ 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'nospace', 'failed' ] } ## # @BlockInfo: