From: Max Reitz Date: Fri, 5 Sep 2014 14:07:15 +0000 (+0200) Subject: qapi/block: Add "fatal" to BLOCK_IMAGE_CORRUPTED X-Git-Tag: qemu-xen-4.6.0-rc1~189^2~28 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9bf040b962f90aa2e1cef6543dfee6c96f73ef7e;p=qemu-upstream-unstable.git qapi/block: Add "fatal" to BLOCK_IMAGE_CORRUPTED Not every BLOCK_IMAGE_CORRUPTED event must be fatal; for example, when reading from an image, they should generally not be. Nonetheless, even an image only read from may of course be corrupted and this can be detected during normal operation. In this case, a non-fatal event should be emitted, but the image should not be marked corrupt (in accordance to "fatal" set to false). Signed-off-by: Max Reitz Reviewed-by: Eric Blake Message-id: 1409926039-29044-2-git-send-email-mreitz@redhat.com Signed-off-by: Stefan Hajnoczi --- diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 43665b86e..0bd75d2fe 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1853,6 +1853,7 @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset, offset, true, size, + true, &error_abort); g_free(message); diff --git a/qapi/block-core.json b/qapi/block-core.json index 1692627e0..ef7faaab5 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1570,7 +1570,7 @@ ## # @BLOCK_IMAGE_CORRUPTED # -# Emitted when a disk image is being marked corrupt +# Emitted when a corruption has been detected in a disk image # # @device: device name # @@ -1584,13 +1584,18 @@ # @size: #optional, if the corruption resulted from an image access, this is # the access size # +# fatal: if set, the image is marked corrupt and therefore unusable after this +# event and must be repaired (Since 2.2; before, every +# BLOCK_IMAGE_CORRUPTED event was fatal) +# # Since: 1.7 ## { 'event': 'BLOCK_IMAGE_CORRUPTED', 'data': { 'device' : 'str', 'msg' : 'str', '*offset': 'int', - '*size' : 'int' } } + '*size' : 'int', + 'fatal' : 'bool' } } ## # @BLOCK_IO_ERROR