05bba0
From e7eca18cb5fec2c7c99b8e0335d630cc368f712b Mon Sep 17 00:00:00 2001
05bba0
From: Max Reitz <mreitz@redhat.com>
05bba0
Date: Sat, 13 Jun 2015 16:22:03 +0200
05bba0
Subject: [PATCH 09/42] qcow2: Use qcow2_signal_corruption() for overlaps
05bba0
MIME-Version: 1.0
05bba0
Content-Type: text/plain; charset=UTF-8
05bba0
Content-Transfer-Encoding: 8bit
05bba0
05bba0
Message-id: <1434212556-3927-10-git-send-email-mreitz@redhat.com>
05bba0
Patchwork-id: 66028
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 09/42] qcow2: Use qcow2_signal_corruption() for overlaps
05bba0
Bugzilla: 1129893
05bba0
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
05bba0
RH-Acked-by: Fam Zheng <famz@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
05bba0
BZ: 1129893
05bba0
05bba0
Use the new function in case of a failed overlap check.
05bba0
05bba0
This changes output in case of corruption, so adapt iotest 060's
05bba0
reference output accordingly.
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Reviewed-by: Eric Blake <eblake@redhat.com>
05bba0
Reviewed-by: BenoƮt Canet <benoit.canet@nodalink.com>
05bba0
Message-id: 1409926039-29044-4-git-send-email-mreitz@redhat.com
05bba0
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
(cherry picked from commit adb435522b86b3fca2324cb8c94e17b55ae071f1)
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
05bba0
Conflicts:
05bba0
	block/qcow2-refcount.c
05bba0
05bba0
qcow2_pre_write_overlap_check() did not use qapi_event_send_*()
05bba0
downstream, but that code is being removed anyway.
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
---
05bba0
 block/qcow2-refcount.c     | 21 +++------------------
05bba0
 tests/qemu-iotests/060.out | 10 +++++-----
05bba0
 2 files changed, 8 insertions(+), 23 deletions(-)
05bba0
05bba0
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
05bba0
index 6fa6daf..dbcc4c6 100644
05bba0
--- a/block/qcow2-refcount.c
05bba0
+++ b/block/qcow2-refcount.c
05bba0
@@ -26,7 +26,6 @@
05bba0
 #include "block/block_int.h"
05bba0
 #include "block/qcow2.h"
05bba0
 #include "qemu/range.h"
05bba0
-#include "qapi/qmp/types.h"
05bba0
 
05bba0
 static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size);
05bba0
 static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
05bba0
@@ -1795,25 +1794,11 @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
05bba0
         return ret;
05bba0
     } else if (ret > 0) {
05bba0
         int metadata_ol_bitnr = ffs(ret) - 1;
05bba0
-        char *message;
05bba0
-        QObject *data;
05bba0
-
05bba0
         assert(metadata_ol_bitnr < QCOW2_OL_MAX_BITNR);
05bba0
 
05bba0
-        fprintf(stderr, "qcow2: Preventing invalid write on metadata (overlaps "
05bba0
-                "with %s); image marked as corrupt.\n",
05bba0
-                metadata_ol_names[metadata_ol_bitnr]);
05bba0
-        message = g_strdup_printf("Prevented %s overwrite",
05bba0
-                metadata_ol_names[metadata_ol_bitnr]);
05bba0
-        data = qobject_from_jsonf("{ 'device': %s, 'msg': %s, 'offset': %"
05bba0
-                PRId64 ", 'size': %" PRId64 ", 'fatal': true }",
05bba0
-                bs->device_name, message, offset, size);
05bba0
-        monitor_protocol_event(QEVENT_BLOCK_IMAGE_CORRUPTED, data);
05bba0
-        g_free(message);
05bba0
-        qobject_decref(data);
05bba0
-
05bba0
-        qcow2_mark_corrupt(bs);
05bba0
-        bs->drv = NULL; /* make BDS unusable */
05bba0
+        qcow2_signal_corruption(bs, true, offset, size, "Preventing invalid "
05bba0
+                                "write on metadata (overlaps with %s)",
05bba0
+                                metadata_ol_names[metadata_ol_bitnr]);
05bba0
         return -EIO;
05bba0
     }
05bba0
 
05bba0
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
05bba0
index c27c952..30806da 100644
05bba0
--- a/tests/qemu-iotests/060.out
05bba0
+++ b/tests/qemu-iotests/060.out
05bba0
@@ -8,7 +8,7 @@ ERROR cluster 3 refcount=1 reference=3
05bba0
 1 errors were found on the image.
05bba0
 Data may be corrupted, or further writes to the image may corrupt it.
05bba0
 incompatible_features     0x0
05bba0
-qcow2: Preventing invalid write on metadata (overlaps with active L1 table); image marked as corrupt.
05bba0
+qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L1 table); further corruption events will be suppressed
05bba0
 write failed: Input/output error
05bba0
 incompatible_features     0x2
05bba0
 qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
05bba0
@@ -24,7 +24,7 @@ ERROR cluster 2 refcount=1 reference=2
05bba0
 2 errors were found on the image.
05bba0
 Data may be corrupted, or further writes to the image may corrupt it.
05bba0
 incompatible_features     0x0
05bba0
-qcow2: Preventing invalid write on metadata (overlaps with refcount block); image marked as corrupt.
05bba0
+qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
05bba0
 write failed: Input/output error
05bba0
 incompatible_features     0x2
05bba0
 Repairing refcount block 0 refcount=2
05bba0
@@ -56,7 +56,7 @@ Data may be corrupted, or further writes to the image may corrupt it.
05bba0
 1 leaked clusters were found on the image.
05bba0
 This means waste of disk space, but no harm to data.
05bba0
 incompatible_features     0x0
05bba0
-qcow2: Preventing invalid write on metadata (overlaps with inactive L2 table); image marked as corrupt.
05bba0
+qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
05bba0
 write failed: Input/output error
05bba0
 incompatible_features     0x2
05bba0
 Repairing cluster 4 refcount=1 reference=2
05bba0
@@ -88,7 +88,7 @@ wrote 65536/65536 bytes at offset 536870912
05bba0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
05bba0
 discard 65536/65536 bytes at offset 0
05bba0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
05bba0
-qcow2: Preventing invalid write on metadata (overlaps with active L2 table); image marked as corrupt.
05bba0
+qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L2 table); further corruption events will be suppressed
05bba0
 blkdebug: Suspended request '0'
05bba0
 write failed: Input/output error
05bba0
 blkdebug: Resuming request '0'
05bba0
@@ -99,6 +99,6 @@ aio_write failed: No medium found
05bba0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
05bba0
 wrote 65536/65536 bytes at offset 0
05bba0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
05bba0
-qcow2: Preventing invalid write on metadata (overlaps with qcow2_header); image marked as corrupt.
05bba0
+qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
05bba0
 write failed: Input/output error
05bba0
 *** done
05bba0
-- 
05bba0
1.8.3.1
05bba0