From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 56D1E80726 for ; Thu, 8 Oct 2026 17:03:35 +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 698H2Kc5026211; Thu, 8 Oct 2026 20:02:21 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698H2Kc5026211 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="o0Qsymb9" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 698H27El026182 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 20:02:07 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698H27El026182 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-49febef74e3so7123725e9.0 for ; Thu, 08 Oct 2026 10:02:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBwQVf1to4VPgq2OtwtvDb0jyyMebZGIOzToRL0sAbimZPYnmYDoVTXQkdsiktSNkM0i1ncMjw==@openvz.org X-Gm-Message-State: AFuF++mDbhgMSVNy/mVjkUl9Q8vOU03c8zlPi7JrqUtbqBEAK6kHpzfT rLnVV3kDAMk3dY00lVXbRLRr0geKRjE2e2GkfNO20p2ohux/Vwso++8F4ii56Q/Y3B+6LQdlPyT s/xuJnvWuwkCnYqeTbPYHfYP00o5SVqmUWdI2u4OnCbHasl6hnM9DLg== X-Gm-Gg: AYBFou0HmePMU+E7sBWEfIZv96tDueyBlQViUjkDpwmtIz+yfeyI/sikXQgw04byfHt 9QGOU1sLHkOuBjkQT6G4kisPijY5vbhXMnRjDHqTRGRRahlWH4ni81aYySyo7S3/jiL8h8bf/pS LQ02w66CjI0E4J5bdllryU6BZyi4HJqLPHmWp86jRdEHV7UUbFczCYOOgF4lvoSa5hQM37mLsdN u3SHAxweocOP5lBrM/91s3IFTrFIoaoyZqCp5VS/Tv0LDoxYBUu/uqUqk1KOEcYRWZJzawaorE8 /jGKCouppuC7yUfA9OnWqfb5FGIij21B7Vv0Pr8f4uf2u/Pm9wstWW4+Ozkxs1WsEhgi9lOXXeQ 9AKDdKFQpffKhKyvDa5YRJ/fxHzY= X-Received: by 2002:a05:600c:3f08:b0:49f:fc4f:9efb with SMTP id 5b1f17b1804b1-4a1851acda1mr63108505e9.7.1791478926814; Thu, 08 Oct 2026 10:02:06 -0700 (PDT) X-Received: by 2002:a05:600c:3f08:b0:49f:fc4f:9efb with SMTP id 5b1f17b1804b1-4a1851acda1mr63104045e9.7.1791478923731; Thu, 08 Oct 2026 10:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791478923; cv=none; d=google.com; s=arc-20260327; b=Ck7uZel7jfA58eMUinGBxLP++t2tULusH0bJyTCjQ0Ct5X+5nyMCh6K84kmUXiKGkO 8WUwx+X0LDqJ6z2s6w+uVrNYDe3ELH1TPIxCSQgd/FtDHtceTaPJeG4RH/nC7Dg8fq+C 4zlEL/kGA4VQJarZzZu6G4OPUkDk4DH4Mm+HQQfm6BRgCLTygH60zZtLwPNqgtJQcVju auS/iFUkeUNYKPdEyVEg2CaY0r/fnxyqMPgQwycKBj/iGkaZPUT6fGeNF7D7JPhOT1No pgBuOWDogsWVKsXzqgaqgBypjwuZyLxzrGMvFZsf9KuGaMyxxvFxMGQMDBJlRUTsOktk hf4g== 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=ukLDLw9KNFAPZZwuWlHXZ02wnO9FydYOadETb0pZ3io=; fh=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=Wr8wMYC/1+iAcGyJ9/92vKHyfRCHVKBvR9VQMf/xY6WyGUX4y+oxSs0QuMb3L0rcHY 7pTrEYO3GDmaf4LjTU5KXrveswoPDWd3nsZpK7PZptpVUusSobV9Pa8+DtlBECtxxjJS swx8jkVVWN2UXsMZC/8fvideDKJcA5g5Zaai7+0St/991wHWlaSZlJe51HSlZz72uDZU NLQacxeaizx+4W6wjWb8lrx3DfbRPl9Mj/1UWnCj8Kr/kym/EKWa+BlhetmCyX2gtp+v R0FlYEEr3G+QfuTMFNNGnyk9pqosPW8UhQ26Fc5c3ePWtAa3A2dXKDjcUbZcjj0TlXkX MSDg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=o0Qsymb9; 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 ffacd0b85a97d-48db658fc0dsi466108f8f.460.2026.10.08.10.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 10:02:03 -0700 (PDT) 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=o0Qsymb9; 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=ukLDLw9KNFAPZZwuWlHXZ02wnO9FydYOadETb0pZ3io=; b=o0Qsymb9I21m yR6MGObgGqKC1W/Dmo3ojX3Lz1GdsYv0jSnp0jlteUEtz/5Osk4hUkg0WvXM95g1+4LV1sTRh/RDG rmSkDtNjV2DLbU9Q+8BxYOOWBJlzoQprOJiX4cHSiGY/vJKJhLwnpDNw1c5ebl+inbgbQutJO38NX 29wNRsOF84S9XDwttzRBj3eW5+NrEBBwJTOhasf9bP1Tgph2bQF9bRC3dA6Hq9TnsicbnNxiUbscj yZLbQbzxwGgL8xPUbYn+2L2KUPVHW0EpTVl3CCP5A9VFYf/3gL/0/xlR1598hQCP3m79H90u6wE9R CvduYJaw+6KyFR5lkJ3IJw==; 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 1xErS3-000z63-0i; Thu, 08 Oct 2026 19:02:00 +0200 From: Alexander Ivanov To: den@openvz.org Date: Thu, 8 Oct 2026 19:01:59 +0200 Message-ID: <20261008170200.646208-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008170200.646208-1-alexander.ivanov@virtuozzo.com> References: <20261008170200.646208-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v4 2/3] 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 --- 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 311a23d63a5c..bb11b8a74598 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; } @@ -834,19 +834,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 pase bitmap extension"); return ret; } break; @@ -879,7 +879,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; @@ -910,14 +910,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 */ } } @@ -939,11 +939,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; } } @@ -976,7 +976,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; } @@ -1057,7 +1057,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; } @@ -1143,7 +1143,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) @@ -1152,7 +1152,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; } @@ -1173,7 +1173,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