From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id A1444803BB for ; Tue, 10 Nov 2026 07:53:08 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AA7psfR011900; Tue, 10 Nov 2026 10:51:54 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AA7psfR011900 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ds8hEgAt" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AA7pj4K011850 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 10 Nov 2026 10:51:46 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AA7pj4K011850 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-490c1867460so1317467f8f.2 for ; Mon, 09 Nov 2026 23:51:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErHsg5F28lhU5G1gtSKKI6a4+IqGbCa5+NRB5tFWNbqrcyWDm8Q0wsgE/jz/3SfHmG05xthtFA==@openvz.org X-Gm-Message-State: APuU4Z+rup65OqIm/UMBPxsJyKVdpdv2aFfpKGM/I4TeMG0IEL8h1Zc2 xbQBtWtyUA3N7l5H0aLqMhDhXiokOq+CxOrKMcmWoA8nGy1wCkVczeQTvqTR767VtCKgIuDuRyM PP87jE01nz4Ypc2YBKnjdK7c5pmgz9L9MpYmJWa3XOG75J4uK84yArg== X-Gm-Gg: AYBFou0pxOJ8XszimZ65dszFBUlKAHDQsAsBHwTM3ot5++akrN3OxLcjUxGgKC0J2Lf P7+P1S21pQKS/wL2Y5rgcRLvD67KdXbOrjrHTwe1H9yyZ2MfiS51BuyundJUGGcY9xB3EJ0xPOs AryLd3XTQvkiWxwW162GvTqGWdqwAqnixPDhF5SKt+l6YJpXndeeCtgp898bhO7gX6/9SoM0q5O zrg/3w+tiDLnTnT3XkqdmoOsc05IkqbL6GDk29MaNN+n7847Tzr+rRkiYsMW12BKARvd+zjJAjp Hlr0xxqH3E90U2oBXtliia2GZtkV5SEYCAdkvB/TOVLC6RVrz444vN9HksQla/ArFPpMUMYM7YW M1Uq06oOE1eoiPdIcn979+uUNI8ty X-Received: by 2002:a05:600c:8b83:b0:4b2:61e5:b2f4 with SMTP id 5b1f17b1804b1-4ba0233985cmr21486625e9.11.1794297105623; Mon, 09 Nov 2026 23:51:45 -0800 (PST) X-Received: by 2002:a05:600c:8b83:b0:4b2:61e5:b2f4 with SMTP id 5b1f17b1804b1-4ba0233985cmr21486435e9.11.1794297105164; Mon, 09 Nov 2026 23:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794297105; cv=none; d=google.com; s=arc-20260327; b=Ncq9nH5TangurjtlpqP/B1HIxIHtq7l2JK3CaQqzfTaaMgz7Z36mo8+ymIEz0c/oKq JGncat0ndBAyCb8NZ7HTGMS9SFPfCoe+m7edQ5hcvIesbMQmrxZol8TzaHVRGgqwl62u G/96NRL+c1KipHkACk10VsrWRXzlzkibVtw895tsv+PMIRYXZd9I+QCJhfuMeI67CK5C gz/IuB+w/R3cs+vIVvygnF5udc36Hh8VPnARgW8u28viUQIU9JBt++1VLrCQfFoh4tez MOq3ky0nPdXzi0xSWSb07m4Q+o75RZ3jL9V7siBHSavg/uQxQ5OsPQ4j81fTfIr/kAde Slig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=x41xuKzHfQaaSRIF55AbVZIszUBpZuQgmc+0qQkH5N8=; fh=E3vCAgcov/hQ3XWh2CqQ9wok33eMAQJstV7H9y+Mjr8=; b=DVhfJXK7F/iHmfp8Tx7DNRmh1yMzY+nv8yalg/Wxy8ApPvWVcTZWnzBADLGB3cRNoQ vGI6JnqHYqf/5mnuLifrXYH8W2g1wtmohQvYZXSSXj8us79p/KMNkkFMKESWl2rnV6Pr HsZeRqB+uc4ZoQ4ryuAhLEt3iDNoEtGySj+B7+X1NCRWakPpLx0tMbVXJlI5POBrEqdp 1bwDvSJ29UHS2kW/Ggu9HK1FMX/CYT9UteXVeGZ7U8HxXI1lFv3OcI0J7GAflkiHbV6q SXHn6wPdX8CchhLNy3UbAxI41mnmvwaCi2KYgrNQKIyRbC1nTB4Jpad2jB6f5AH7PPOT tUvQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=ds8hEgAt; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id 5b1f17b1804b1-4ba02043526si32023205e9.10.2026.11.09.23.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 23:51:45 -0800 (PST) Received-SPF: pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=ds8hEgAt; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=x41xuKzHfQaaSRIF55AbVZIszUBpZuQgmc+0qQkH5N8=; b=ds8hEgAta+AL 6P67QCDoSEsb0nSN3bN2DRldTcJHCGisc/mbdQgRtvQM+KWteilIb9n+uBlHx/2S7F3ESVOEIoTky gMGKRPuPvN0/gi9qVYEXI23FwCO/cRg/LaviMgvjdH/E6+Gd23gGB0J4vzEv0GX9n7jLly7ItBF2z 6dRKA5G/1ozGdxOJL9F0EffENQiY+ZgbVSDIFDRLJvfqbGT5d0KGnBvSrkSOVi75rstN0oqZJ/Lw1 rQ030yqqM4se1HeNyUyscRuCjIK+B0GwkQ9Hs5nKe5Tb1LCdSpxdFx8BKZ4RZ6+o1zmIYzCH91jvN FW8znMKXapW5o6zIOLJp9Q==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xQgZn-008dOX-0V; Tue, 10 Nov 2026 08:51:35 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 10 Nov 2026 08:51:30 +0100 Message-ID: <20261110075140.1475607-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com> References: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v12 02/12] dm-qcow2: drop duplicate prefix from QC_ERR/QC_INFO messages X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org QCOW2_FMT already adds the "dm-qcow2: : " prefix and the trailing newline, so several messages were printed like: dm-qcow2: : dm-qcow2: Can't parse metadata and some of them were followed by an empty line. Drop the redundant prefix and newlines. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Alexander Ivanov Reviewed-by: Denis V. Lunev Reviewed-by: Andrey Zhadchenko --- drivers/md/dm-qcow2-target.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 0cbbd8e4f493..bb322254cea9 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -192,7 +192,7 @@ void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2 md = rb_entry(node, struct md_page, node); /* FIXME: call md_make_dirty() and try once again? */ if (md->status & MD_WRITEBACK_ERROR) { - QC_ERR(tgt->ti, "qcow2: Failed to write dirty pages"); + QC_ERR(tgt->ti, "Failed to write dirty pages"); tgt->md_writeback_error = true; break; } @@ -840,19 +840,19 @@ static int qcow2_parse_extensions(struct dm_target *ti, struct qcow2 *qcow2, struct Qcow2BitmapHeaderExt bitmaps_ext; if (ext.len != sizeof(bitmaps_ext)) { - QC_ERR(ti, "unexpected bitmap extension size\n"); + QC_ERR(ti, "unexpected bitmap extension size"); return -EINVAL; } if (offset + sizeof(bitmaps_ext) > end) { - QC_ERR(ti, "unexpected end of extension area\n"); + QC_ERR(ti, "unexpected end of extension area"); return -EINVAL; } memcpy(&bitmaps_ext, addr + offset, sizeof(bitmaps_ext)); ret = qcow2_parse_bitmap_ext(ti, qcow2, &bitmaps_ext); if (ret) { - QC_ERR(ti, "unable to pase bitmap extension\n"); + QC_ERR(ti, "unable to parse bitmap extension"); return ret; } break; @@ -886,7 +886,7 @@ static int qcow2_parse_header(struct dm_target *ti, struct qcow2 *qcow2, new_size = PAGE_ALIGN(qcow2->file_size); ret = qcow2_truncate_safe(file, new_size); if (ret) { - QC_ERR(ti, "qcow2: Can't truncate file"); + QC_ERR(ti, "Can't truncate file"); return ret; } /* See md_page_read_complete() */ qcow2->file_size = new_size; @@ -918,14 +918,14 @@ static int qcow2_parse_header(struct dm_target *ti, struct qcow2 *qcow2, ret = -EXDEV; if (upper) { if (upper->clu_size != qcow2->clu_size) { - QC_ERR(ti, "dm-qcow2: clu_size mismatch\n"); + QC_ERR(ti, "clu_size mismatch"); goto out; } if (upper->ext_l2 != qcow2->ext_l2) { if (is_bottom && upper->ext_l2 && !qcow2->ext_l2) { - QC_INFO(ti, "dm-qcow2: using bottom delta without ext_l2\n"); + QC_INFO(ti, "using bottom delta without ext_l2"); } else { - QC_ERR(ti, "dm-qcow2: upper delta without ext_l2 is unsupported\n"); + QC_ERR(ti, "upper delta without ext_l2 is unsupported"); goto out; /* This is not supported yet */ } } @@ -947,11 +947,11 @@ static int qcow2_parse_header(struct dm_target *ti, struct qcow2 *qcow2, ext_end = PAGE_SIZE; if (ext_end > PAGE_SIZE) { - QC_INFO(ti, "extensions are too long, skipping them\n"); + QC_INFO(ti, "extensions are too long, skipping them"); } else { ret = qcow2_parse_extensions(ti, qcow2, ext_start, ext_end, raw_hdr); if (ret) { - QC_ERR(ti, "failed to parse extensions\n"); + QC_ERR(ti, "failed to parse extensions"); goto out; } } @@ -986,7 +986,7 @@ static int qcow2_parse_metadata(struct dm_target *ti, struct qcow2_target *tgt) ret = 0; out: if (ret) - QC_ERR(ti, "dm-qcow2: Can't parse metadata"); + QC_ERR(ti, "Can't parse metadata"); return ret; } @@ -1067,7 +1067,7 @@ static void qcow2_truncate_preallocations(struct dm_target *ti) ret = qcow2_truncate_safe(qcow2->file, end); if (ret) { - QC_ERR(ti, "dm-qcow2: Can't truncate preallocations"); + QC_ERR(ti, "Can't truncate preallocations"); tgt->truncate_error = true; return; } @@ -1153,7 +1153,7 @@ static void qcow2_postsuspend(struct dm_target *ti) if (dm_table_get_mode(ti->table) & FMODE_WRITE) { ret = qcow2_set_image_file_features(qcow2, false); if (ret) - QC_ERR(ti, "qcow2: Can't set features"); + QC_ERR(ti, "Can't set features"); } } static int qcow2_preresume(struct dm_target *ti) @@ -1162,7 +1162,7 @@ static int qcow2_preresume(struct dm_target *ti) int ret = 0; if (qcow2_wants_check(tgt)) { - QC_ERR(ti, "qcow2: image check and target reload are required"); + QC_ERR(ti, "image check and target reload are required"); return -EIO; } @@ -1183,7 +1183,7 @@ static int qcow2_preresume(struct dm_target *ti) if (dm_table_get_mode(ti->table) & FMODE_WRITE) { ret = qcow2_set_image_file_features(tgt->top, true); if (ret) - QC_ERR(ti, "qcow2: Can't set features"); + QC_ERR(ti, "Can't set features"); } if (!ret) qcow2_set_wants_suspend(ti, false); -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel