qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL v2 32/59] qcow2: Add qcow2_signal_corruption()
Date: Mon, 22 Sep 2014 12:42:03 +0100	[thread overview]
Message-ID: <1411386150-24003-33-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1411386150-24003-1-git-send-email-stefanha@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Add a helper function for easily marking an image corrupt (on fatal
corruptions) while outputting an informative message to stderr and via
QAPI.

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-3-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/qcow2.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 block/qcow2.h |  5 +++++
 2 files changed, 53 insertions(+)

diff --git a/block/qcow2.c b/block/qcow2.c
index 0daf25c..f4bbe8b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -31,6 +31,8 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/util.h"
+#include "qapi/qmp/types.h"
+#include "qapi-event.h"
 #include "trace.h"
 #include "qemu/option_int.h"
 
@@ -2529,6 +2531,52 @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts)
     return 0;
 }
 
+/*
+ * If offset or size are negative, respectively, they will not be included in
+ * the BLOCK_IMAGE_CORRUPTED event emitted.
+ * fatal will be ignored for read-only BDS; corruptions found there will always
+ * be considered non-fatal.
+ */
+void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
+                             int64_t size, const char *message_format, ...)
+{
+    BDRVQcowState *s = bs->opaque;
+    char *message;
+    va_list ap;
+
+    fatal = fatal && !bs->read_only;
+
+    if (s->signaled_corruption &&
+        (!fatal || (s->incompatible_features & QCOW2_INCOMPAT_CORRUPT)))
+    {
+        return;
+    }
+
+    va_start(ap, message_format);
+    message = g_strdup_vprintf(message_format, ap);
+    va_end(ap);
+
+    if (fatal) {
+        fprintf(stderr, "qcow2: Marking image as corrupt: %s; further "
+                "corruption events will be suppressed\n", message);
+    } else {
+        fprintf(stderr, "qcow2: Image is corrupt: %s; further non-fatal "
+                "corruption events will be suppressed\n", message);
+    }
+
+    qapi_event_send_block_image_corrupted(bdrv_get_device_name(bs), message,
+                                          offset >= 0, offset, size >= 0, size,
+                                          fatal, &error_abort);
+    g_free(message);
+
+    if (fatal) {
+        qcow2_mark_corrupt(bs);
+        bs->drv = NULL; /* make BDS unusable */
+    }
+
+    s->signaled_corruption = true;
+}
+
 static QemuOptsList qcow2_create_opts = {
     .name = "qcow2-create-opts",
     .head = QTAILQ_HEAD_INITIALIZER(qcow2_create_opts.head),
diff --git a/block/qcow2.h b/block/qcow2.h
index 6aeb7ea..7b7b6a6 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -261,6 +261,7 @@ typedef struct BDRVQcowState {
     bool discard_passthrough[QCOW2_DISCARD_MAX];
 
     int overlap_check; /* bitmask of Qcow2MetadataOverlap values */
+    bool signaled_corruption;
 
     uint64_t incompatible_features;
     uint64_t compatible_features;
@@ -477,6 +478,10 @@ int qcow2_mark_corrupt(BlockDriverState *bs);
 int qcow2_mark_consistent(BlockDriverState *bs);
 int qcow2_update_header(BlockDriverState *bs);
 
+void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
+                             int64_t size, const char *message_format, ...)
+                             GCC_FMT_ATTR(5, 6);
+
 /* qcow2-refcount.c functions */
 int qcow2_refcount_init(BlockDriverState *bs);
 void qcow2_refcount_close(BlockDriverState *bs);
-- 
1.9.3

  parent reply	other threads:[~2014-09-22 12:26 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-22 11:41 [Qemu-devel] [PULL v2 00/59] Block patches Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 01/59] block/vhdx.c: Mark parent_vhdx_guid variable as unused Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 02/59] ide/atapi: Mark non-data commands as complete Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 03/59] aio-win32: fix uninitialized use of have_select_revents Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 04/59] ide/ahci: Check for -ECANCELED in aio callbacks Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 05/59] block: Add refcnt in BlockDriverAIOCB Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 06/59] block: Add bdrv_aio_cancel_async Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 07/59] block: Drop bdrv_em_co_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 08/59] block: Drop bdrv_em_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 09/59] thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 10/59] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 11/59] dma: Convert dma_aiocb_info.cancel " Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 12/59] iscsi: Convert iscsi_aiocb_info.cancel " Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 13/59] archipelago: Drop archipelago_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 14/59] blkdebug: Drop blkdebug_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 15/59] blkverify: Drop blkverify_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 16/59] curl: Drop curl_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 17/59] qed: Drop qed_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 18/59] quorum: fix quorum_aio_cancel() Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 19/59] quorum: Convert quorum_aiocb_info.cancel to .cancel_async Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 20/59] rbd: Drop rbd_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 21/59] sheepdog: Convert sd_aiocb_info.cancel to .cancel_async Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 22/59] win32-aio: Drop win32_aiocb_info.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 23/59] ide: Convert trim_aiocb_info.cancel to .cancel_async Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 24/59] block: Drop AIOCBInfo.cancel Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 25/59] block: Rename qemu_aio_release -> qemu_aio_unref Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 26/59] qdev-monitor: fix segmentation fault on qdev_device_help() Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 27/59] aio-win32: avoid out-of-bounds access to the events array Stefan Hajnoczi
2014-09-22 11:41 ` [Qemu-devel] [PULL v2 28/59] block: Introduce "null" drivers Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 29/59] qapi: Sort BlockdevDriver enum data list Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 30/59] qapi: Sort items in BlockdevOptions definition Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 31/59] qapi/block: Add "fatal" to BLOCK_IMAGE_CORRUPTED Stefan Hajnoczi
2014-09-22 11:42 ` Stefan Hajnoczi [this message]
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 33/59] qcow2: Use qcow2_signal_corruption() for overlaps Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 34/59] qcow2: Check L1/L2/reftable entries for alignment Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 35/59] iotests: Add more tests for qcow2 corruption Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 36/59] image-fuzzer: Trivial readability and formatting improvements Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 37/59] hmp: fix memory leak at hmp_info_block_jobs() Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 38/59] qcow2: Fix leak of QemuOpts in qcow2_open() Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 39/59] qapi: Allow enums in anonymous unions Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 40/59] qcow2: Add overlap-check.template option Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 41/59] qapi/block-core: Add "new" qcow2 options Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 42/59] docs: List all image elements currently supported by the fuzzer Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 43/59] fuzz: Add fuzzing functions for entries of refcount table and blocks Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 44/59] layout: Add generators for " Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 45/59] ahci: Adding basic functionality qtest Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 46/59] ahci: MSI capability should be at 0x80, not 0x50 Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 47/59] ahci: Add test_pci_spec to ahci-test Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 48/59] ahci: add test_pci_enable " Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 49/59] ahci: properly shadow the TFD register Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 50/59] ahci: Add test_hba_spec to ahci-test Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 51/59] ahci: Add test_hba_enable " Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 52/59] ahci: Add test_identify case " Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 53/59] block/archipelago: Fix typo in qemu_archipelago_truncate() Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 54/59] block: delete cow block driver Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 55/59] block: vhdx - fix reading beyond pointer during image creation Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 56/59] async: aio_context_new(): Handle event_notifier_init failure Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 57/59] virtio: Import virtio_vring.h Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 58/59] vring: Better error handling if num is too large Stefan Hajnoczi
2014-09-22 11:42 ` [Qemu-devel] [PULL v2 59/59] block: Always compile virtio-blk dataplane Stefan Hajnoczi
2014-09-23 12:23 ` [Qemu-devel] [PULL v2 00/59] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411386150-24003-33-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).