[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/38] block/parallels: implement parallels_check met
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 19/38] block/parallels: implement parallels_check method of block driver |
Date: |
Fri, 22 May 2015 10:01:51 +0100 |
From: "Denis V. Lunev" <address@hidden>
The check is very simple at the moment. It calculates necessary stats
and fix only the following errors:
- space leak at the end of the image. This would happens due to
preallocation
- clusters outside the image are zeroed. Nothing else could be done here
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Roman Kagan <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Roman Kagan <address@hidden>
Message-id: address@hidden
CC: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/parallels.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/block/parallels.c b/block/parallels.c
index 35ffb6f..35f231a 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -242,6 +242,90 @@ static coroutine_fn int
parallels_co_readv(BlockDriverState *bs,
return ret;
}
+
+static int parallels_check(BlockDriverState *bs, BdrvCheckResult *res,
+ BdrvCheckMode fix)
+{
+ BDRVParallelsState *s = bs->opaque;
+ int64_t size, prev_off, high_off;
+ int ret;
+ uint32_t i;
+ bool flush_bat = false;
+ int cluster_size = s->tracks << BDRV_SECTOR_BITS;
+
+ size = bdrv_getlength(bs->file);
+ if (size < 0) {
+ res->check_errors++;
+ return size;
+ }
+
+ res->bfi.total_clusters = s->bat_size;
+ res->bfi.compressed_clusters = 0; /* compression is not supported */
+
+ high_off = 0;
+ prev_off = 0;
+ for (i = 0; i < s->bat_size; i++) {
+ int64_t off = bat2sect(s, i) << BDRV_SECTOR_BITS;
+ if (off == 0) {
+ prev_off = 0;
+ continue;
+ }
+
+ /* cluster outside the image */
+ if (off > size) {
+ fprintf(stderr, "%s cluster %u is outside image\n",
+ fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i);
+ res->corruptions++;
+ if (fix & BDRV_FIX_ERRORS) {
+ prev_off = 0;
+ s->bat_bitmap[i] = 0;
+ res->corruptions_fixed++;
+ flush_bat = true;
+ continue;
+ }
+ }
+
+ res->bfi.allocated_clusters++;
+ if (off > high_off) {
+ high_off = off;
+ }
+
+ if (prev_off != 0 && (prev_off + cluster_size) != off) {
+ res->bfi.fragmented_clusters++;
+ }
+ prev_off = off;
+ }
+
+ if (flush_bat) {
+ ret = bdrv_pwrite_sync(bs->file, 0, s->header, s->header_size);
+ if (ret < 0) {
+ res->check_errors++;
+ return ret;
+ }
+ }
+
+ res->image_end_offset = high_off + cluster_size;
+ if (size > res->image_end_offset) {
+ int64_t count;
+ count = DIV_ROUND_UP(size - res->image_end_offset, cluster_size);
+ fprintf(stderr, "%s space leaked at the end of the image %" PRId64
"\n",
+ fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR",
+ size - res->image_end_offset);
+ res->leaks += count;
+ if (fix & BDRV_FIX_LEAKS) {
+ ret = bdrv_truncate(bs->file, res->image_end_offset);
+ if (ret < 0) {
+ res->check_errors++;
+ return ret;
+ }
+ res->leaks_fixed += count;
+ }
+ }
+
+ return 0;
+}
+
+
static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)
{
int64_t total_size, cl_size;
@@ -449,6 +533,7 @@ static BlockDriver bdrv_parallels = {
.bdrv_co_writev = parallels_co_writev,
.bdrv_create = parallels_create,
+ .bdrv_check = parallels_check,
.create_opts = ¶llels_create_opts,
};
--
2.1.0
- [Qemu-devel] [PULL 04/38] block/parallels: read up to cluster end in one go, (continued)
- [Qemu-devel] [PULL 04/38] block/parallels: read up to cluster end in one go, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 09/38] block/parallels: _co_writev callback for Parallels format, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 11/38] block/parallels: support parallels image creation, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 10/38] iotests, parallels: test for write into Parallels image, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 12/38] iotests, parallels: test for newly created parallels image via qemu-img, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 13/38] parallels: change copyright information in the image header, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 14/38] block/parallels: rename catalog_ names to bat_, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 18/38] block/parallels: move parallels_open/probe to the very end of the file, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 16/38] block/parallels: keep BAT bitmap data in little endian in memory, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 15/38] block/parallels: create bat2sect helper, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 19/38] block/parallels: implement parallels_check method of block driver,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 17/38] block/parallels: read parallels image header and BAT into single buffer, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 20/38] block/parallels: implement incorrect close detection, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 21/38] iotests, parallels: check for incorrectly closed image in tests, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 24/38] block/parallels: delay writing to BAT till bdrv_co_flush_to_os, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 22/38] block/parallels: improve image reading performance, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 23/38] block/parallels: create bat_entry_off helper, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 26/38] block/parallels: optimize linear image expansion, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 28/38] configure: handle clang -nopie argument warning, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 27/38] block/parallels: improve image writing performance further, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 29/38] configure: factor out supported flag check, Stefan Hajnoczi, 2015/05/22