diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-09-05 16:07:17 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-09-22 11:39:28 +0100 |
| commit | adb435522b86b3fca2324cb8c94e17b55ae071f1 (patch) | |
| tree | a30aa6299f6a779aff3d5976286c409694f2cb09 /block | |
| parent | 85186ebdac7e183242deaa55d5049988de832be1 (diff) | |
| download | qemu-adb435522b86b3fca2324cb8c94e17b55ae071f1.tar.gz qemu-adb435522b86b3fca2324cb8c94e17b55ae071f1.tar.bz2 qemu-adb435522b86b3fca2324cb8c94e17b55ae071f1.zip | |
qcow2: Use qcow2_signal_corruption() for overlaps
Use the new function in case of a failed overlap check.
This changes output in case of corruption, so adapt iotest 060's
reference output accordingly.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Message-id: 1409926039-29044-4-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-refcount.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 0bd75d2fe6..b9d421e153 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -26,8 +26,6 @@ #include "block/block_int.h" #include "block/qcow2.h" #include "qemu/range.h" -#include "qapi/qmp/types.h" -#include "qapi-event.h" static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size); static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, @@ -1838,27 +1836,11 @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset, return ret; } else if (ret > 0) { int metadata_ol_bitnr = ffs(ret) - 1; - char *message; - assert(metadata_ol_bitnr < QCOW2_OL_MAX_BITNR); - fprintf(stderr, "qcow2: Preventing invalid write on metadata (overlaps " - "with %s); image marked as corrupt.\n", - metadata_ol_names[metadata_ol_bitnr]); - message = g_strdup_printf("Prevented %s overwrite", - metadata_ol_names[metadata_ol_bitnr]); - qapi_event_send_block_image_corrupted(bdrv_get_device_name(bs), - message, - true, - offset, - true, - size, - true, - &error_abort); - g_free(message); - - qcow2_mark_corrupt(bs); - bs->drv = NULL; /* make BDS unusable */ + qcow2_signal_corruption(bs, true, offset, size, "Preventing invalid " + "write on metadata (overlaps with %s)", + metadata_ol_names[metadata_ol_bitnr]); return -EIO; } |