[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/18] block: vhdx - improve error message, and .bdrv
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 08/18] block: vhdx - improve error message, and .bdrv_check implementation |
Date: |
Fri, 20 Dec 2013 16:46:46 +0100 |
From: Jeff Cody <address@hidden>
If there is a dirty log file to be replayed in a VHDX image, it is
replayed in .vhdx_open(). However, if the file is opened read-only,
then a somewhat cryptic error message results.
This adds a more helpful error message for the user. If an image file
contains a log to be replayed, and is opened read-only, the user is
instructed to run 'qemu-img check -r all' on the image file.
Running qemu-img check -r all will cause the image file to be opened
r/w, which will replay the log file. If a log file replay is detected,
this is flagged, and bdrv_check will increase the corruptions_fixed
count for the image.
[Fixed typo in error message that was pointed out by Eric Blake
<address@hidden>.
--Stefan]
Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/vhdx-log.c | 13 ++++++++++++-
block/vhdx.c | 22 ++++++++++++++++++++--
block/vhdx.h | 5 ++++-
3 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index ee5583c..8c9ae0d 100644
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -706,7 +706,8 @@ exit:
*
* If read-only, we must replay the log in RAM (or refuse to open
* a dirty VHDX file read-only) */
-int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed)
+int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,
+ Error **errp)
{
int ret = 0;
VHDXHeader *hdr;
@@ -761,6 +762,16 @@ int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s,
bool *flushed)
}
if (logs.valid) {
+ if (bs->read_only) {
+ ret = -EPERM;
+ error_setg_errno(errp, EPERM,
+ "VHDX image file '%s' opened read-only, but "
+ "contains a log that needs to be replayed. To "
+ "replay the log, execute:\n qemu-img check -r "
+ "all '%s'",
+ bs->filename, bs->filename);
+ goto exit;
+ }
/* now flush the log */
ret = vhdx_log_flush(bs, s, &logs);
if (ret < 0) {
diff --git a/block/vhdx.c b/block/vhdx.c
index 67bbe10..1995778 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -878,7 +878,6 @@ static int vhdx_open(BlockDriverState *bs, QDict *options,
int flags,
int ret = 0;
uint32_t i;
uint64_t signature;
- bool log_flushed = false;
s->bat = NULL;
@@ -907,7 +906,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options,
int flags,
goto fail;
}
- ret = vhdx_parse_log(bs, s, &log_flushed);
+ ret = vhdx_parse_log(bs, s, &s->log_replayed_on_open, errp);
if (ret < 0) {
goto fail;
}
@@ -1854,6 +1853,24 @@ exit:
return ret;
}
+/* If opened r/w, the VHDX driver will automatically replay the log,
+ * if one is present, inside the vhdx_open() call.
+ *
+ * If qemu-img check -r all is called, the image is automatically opened
+ * r/w and any log has already been replayed, so there is nothing (currently)
+ * for us to do here
+ */
+static int vhdx_check(BlockDriverState *bs, BdrvCheckResult *result,
+ BdrvCheckMode fix)
+{
+ BDRVVHDXState *s = bs->opaque;
+
+ if (s->log_replayed_on_open) {
+ result->corruptions_fixed++;
+ }
+ return 0;
+}
+
static QEMUOptionParameter vhdx_create_options[] = {
{
.name = BLOCK_OPT_SIZE,
@@ -1898,6 +1915,7 @@ static BlockDriver bdrv_vhdx = {
.bdrv_co_writev = vhdx_co_writev,
.bdrv_create = vhdx_create,
.bdrv_get_info = vhdx_get_info,
+ .bdrv_check = vhdx_check,
.create_options = vhdx_create_options,
};
diff --git a/block/vhdx.h b/block/vhdx.h
index 51183b2..2acd7c2 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -394,6 +394,8 @@ typedef struct BDRVVHDXState {
Error *migration_blocker;
+ bool log_replayed_on_open;
+
QLIST_HEAD(VHDXRegionHead, VHDXRegionEntry) regions;
} BDRVVHDXState;
@@ -408,7 +410,8 @@ uint32_t vhdx_checksum_calc(uint32_t crc, uint8_t *buf,
size_t size,
bool vhdx_checksum_is_valid(uint8_t *buf, size_t size, int crc_offset);
-int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed);
+int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,
+ Error **errp);
int vhdx_log_write_and_flush(BlockDriverState *bs, BDRVVHDXState *s,
void *data, uint32_t length, uint64_t offset);
--
1.8.4.2
- [Qemu-devel] [PULL 00/18] Block patches, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 01/18] sheepdog: fix dynamic grow for running qcow2 format, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 02/18] vring: create a common function to parse descriptors, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 03/18] vring: factor common code for error exits, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 04/18] dataplane: change vring API to use VirtQueueElement, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 05/18] dataplane: replace hostmem with memory_region_find, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 07/18] block/iscsi: Fix compilation for libiscsi 1.4.0 (API change), Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 06/18] qapi-schema: fix QEMU 1.8 references, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 08/18] block: vhdx - improve error message, and .bdrv_check implementation,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 09/18] docs: updated qemu-img man page and qemu-doc to reflect VHDX support., Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 10/18] vmdk: Check VMFS extent line field number, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 11/18] vmdk: Allow vmdk_create to work with protocol, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 12/18] qemu-iotests: drop duplicate virtio-blk initialization failure, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 13/18] mirror: Don't close target, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 14/18] mirror: Move base to MirrorBlockJob, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 15/18] block: Add commit_active_start(), Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 16/18] commit: Support commit active layer, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 17/18] qemu-iotests: Update test cases for commit active, Stefan Hajnoczi, 2013/12/20
- [Qemu-devel] [PULL 18/18] commit: Remove unused check, Stefan Hajnoczi, 2013/12/20