| Message ID | 20220902085300.508078-6-alexander.ivanov@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | parallels: Add duplication check, repair at open, fix bugs | expand |
On 9/2/22 10:52, Alexander Ivanov wrote: > Use a standard QEMU function for logging. > > Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> > --- > block/parallels.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/block/parallels.c b/block/parallels.c > index 688aa081e2..08526196da 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -42,6 +42,7 @@ > #include "qemu/bswap.h" > #include "qemu/bitmap.h" > #include "qemu/memalign.h" > +#include "qemu/log-for-trace.h" > #include "migration/blocker.h" > #include "parallels.h" > > @@ -448,7 +449,7 @@ static void parallels_check_unclean(BlockDriverState *bs, > return; > } > > - fprintf(stderr, "%s image was not closed correctly\n", > + qemu_log("%s image was not closed correctly\n", > fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR"); > res->corruptions++; > if (fix & BDRV_FIX_ERRORS) { > @@ -476,7 +477,7 @@ static int parallels_check_outside_image(BlockDriverState *bs, > for (i = 0; i < s->bat_size; i++) { > off = bat2sect(s, i) << BDRV_SECTOR_BITS; > if (off >= size) { > - fprintf(stderr, "%s cluster %u is outside image\n", > + qemu_log("%s cluster %u is outside image\n", > fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i); > res->corruptions++; > if (fix & BDRV_FIX_ERRORS) { > @@ -549,7 +550,7 @@ static int parallels_check_leak(BlockDriverState *bs, > } > > count = DIV_ROUND_UP(cut_out, s->cluster_size); > - fprintf(stderr, "%s space leaked at the end of the image %" PRId64 "\n", > + qemu_log("%s space leaked at the end of the image %" PRId64 "\n", > fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR", cut_out); > > res->leaks += count; > @@ -600,8 +601,7 @@ static int parallels_check_duplicate(BlockDriverState *bs, > cluster_index = host_cluster_index(s, off); > if (test_bit(cluster_index, bitmap)) { > /* this cluster duplicates another one */ > - fprintf(stderr, > - "%s duplicate offset in BAT entry %u\n", > + qemu_log("%s duplicate offset in BAT entry %u\n", > fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i); > > res->corruptions++; formatting is broken. next line after qemu_log should be indented with one more space. I would be happy to get more detailed motivation, which should say that once the check will be called during normal work, tracking of the check MUST be present in VM log to have some clues if something will go wrong with customer's data. Den
diff --git a/block/parallels.c b/block/parallels.c index 688aa081e2..08526196da 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -42,6 +42,7 @@ #include "qemu/bswap.h" #include "qemu/bitmap.h" #include "qemu/memalign.h" +#include "qemu/log-for-trace.h" #include "migration/blocker.h" #include "parallels.h" @@ -448,7 +449,7 @@ static void parallels_check_unclean(BlockDriverState *bs, return; } - fprintf(stderr, "%s image was not closed correctly\n", + qemu_log("%s image was not closed correctly\n", fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR"); res->corruptions++; if (fix & BDRV_FIX_ERRORS) { @@ -476,7 +477,7 @@ static int parallels_check_outside_image(BlockDriverState *bs, for (i = 0; i < s->bat_size; i++) { off = bat2sect(s, i) << BDRV_SECTOR_BITS; if (off >= size) { - fprintf(stderr, "%s cluster %u is outside image\n", + qemu_log("%s cluster %u is outside image\n", fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i); res->corruptions++; if (fix & BDRV_FIX_ERRORS) { @@ -549,7 +550,7 @@ static int parallels_check_leak(BlockDriverState *bs, } count = DIV_ROUND_UP(cut_out, s->cluster_size); - fprintf(stderr, "%s space leaked at the end of the image %" PRId64 "\n", + qemu_log("%s space leaked at the end of the image %" PRId64 "\n", fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR", cut_out); res->leaks += count; @@ -600,8 +601,7 @@ static int parallels_check_duplicate(BlockDriverState *bs, cluster_index = host_cluster_index(s, off); if (test_bit(cluster_index, bitmap)) { /* this cluster duplicates another one */ - fprintf(stderr, - "%s duplicate offset in BAT entry %u\n", + qemu_log("%s duplicate offset in BAT entry %u\n", fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i); res->corruptions++;
Use a standard QEMU function for logging. Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> --- block/parallels.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)