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 06F2380958 for ; Sat, 10 Oct 2026 12:48:15 +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 69ACl0YO021945; Sat, 10 Oct 2026 15:47:01 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69ACl0YO021945 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="TUEgXaHh" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69ACkoJ0021921 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Sat, 10 Oct 2026 15:46:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69ACkoJ0021921 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48b01a74792so408267f8f.0 for ; Sat, 10 Oct 2026 05:46:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBw1JsXBnks4mYTSqk4+L6NigQCoi4nU1vffdL9ahC5HiUtCdG1UdobZTC0YYgXm7frhseSskQ==@openvz.org X-Gm-Message-State: AFq9FYK+/9mJ/I1w05/t+5Fi1YjpskLju8cQNXUvL6AqionYZdpVj9Es vg3jk8RTb6qx+L+RKFEiVgipMRM7pcsg2n7XIDbB66EgWwMpQIXnYDO8m7b76BWLKYaPAVYqwX/ JVcMaIr41OsePdt81/8tRKI7fLpmaasWMJB0Cd3P+e49pl/ROlN6OMg== X-Gm-Gg: AYBFou1lyzG93u+JSve2uThumhIcVH1lnM+gaUVuBi2EjCqivoRLh8Xuk2xHoI5+lFo Ek+wTPLBpSris6wkcsR8FPEliGrXUnxmgpx4kkjctJRzVVWsJrSJK5oIE20+zL1PWowCDCECxz0 zE62+wmaoky307dBFKamu4ROMXNAqQVmqUWzAcc06Lvo2QoY5wKDWBr1DsoLDb5mTeR1/0rVek4 ckugvsWvplNuaOHabBvkmcgF2RPCGTqB0jov4PMsYIkF7q8L/7uwzBzRsCVTSo0FqPPYdMirgXT ADn46AwzjLHXCLNty/k4m8aUNK6ZO1mXTXh5nQ0QGHHoWoXaax1Etp9emwVUQB0jihEnNzYsGSj F/Y8gFoxvFiCKKlDjVNwO1de5BWQ= X-Received: by 2002:a05:6000:4818:b0:48a:ffcc:5b50 with SMTP id ffacd0b85a97d-48dbace8c04mr8229731f8f.40.1791636409974; Sat, 10 Oct 2026 05:46:49 -0700 (PDT) X-Received: by 2002:a05:6000:4818:b0:48a:ffcc:5b50 with SMTP id ffacd0b85a97d-48dbace8c04mr8229701f8f.40.1791636409329; Sat, 10 Oct 2026 05:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791636409; cv=none; d=google.com; s=arc-20260327; b=VelW8wEt550DraIeOj/KjLvv9WS5596CVnhO/ops4VQoJhmN8j1THv+bXXscmjsC8X SjrERRp0iIC1tM4Gugx/mgImZPmNsKPyP9lzCxzGKGw0mCj4GFC6rTJihf4kMe84sAh9 nUPx1zUDv1ovCC+gR6ykwoRikN8CkUIC6spJiTwFI896tQGfjvSgmUD6dysjly/7mRkL 4onu8iJ4pw3s5/eSddpjB1Skg5gbwBN+D8R/ZF613CaDzdG8BIlyUdJkyHlOxM0qp446 bKPhlMxap6i88/aA1BHFXJC6eazDRwuGXgCPx8XFfhP2hocWQ9AiZBmR1/Yp6OaV4jLA rA3A== 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=7ldVAdlsFHD42fOTeLIPB3Lya6lnC18JTldpEd7YRJ0=; fh=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=DjaGgvjfULQp0pnGZgLKD0ywQoW5RS61++sTBOsoe+scsscCsrrXTcgtkehcA7jYro M4qyNAGpLvtuh+1K3/jNNGnMpVEOzUwSSCLlwNfjW4q4A96D423GjSTG8sthYSINLtcE 3Aq6yGK1QY0ChiTiboF0/0X/exQOFteiaKfecyCoFdv+tt0TmX7mLFZZCBTZvsGhihCD 0mrpADiArlWkyuKm0F6DaEomXhRJwuENowwMZ7Tm96AP0Kk62b6Bt9es37j8MLxr6B90 6+SEOvsUu5QLiMyL26faS+jNsUs8q8JnMXEPLDan+FM4shL27KktUKLzrLaVHWSl0sxA Ip5g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=TUEgXaHh; 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-48db9b154fasi8952289f8f.482.2026.10.10.05.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2026 05:46:49 -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=TUEgXaHh; 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=7ldVAdlsFHD42fOTeLIPB3Lya6lnC18JTldpEd7YRJ0=; b=TUEgXaHh+f/S sftjeMr1EllQZ0gNcDOyiXgMLwLHX7TO6iD0sh0Xz9rYYCRu6AmHLRN3msE6IordB8W4ZIImQDRhG xBkqmq29GPjN/NS33pkfZRVzEwxj+zOB8s9TWNeqKlm8cVf0YMojKPuumN8CyITqUp+3+zIYALoOp D6QwRJEQHC1h7uPYIgPKGpjeesz997rHyPsaXa+IKh7jB9lx+xnQMyPai579amLmnNgPg2osls3OZ wQROxGSkiQ+LYXsJ6hprNJ1lFhAgEfOmNxKZ4jW2ilSTPrJoo/uNSzT5dkrLMfGLUpJvvHsMjTG5g BcoUDUed7+tkX4+gEouPpw==; 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 1xFWQ6-00G6FQ-09; Sat, 10 Oct 2026 14:46:43 +0200 From: Alexander Ivanov To: den@openvz.org Date: Sat, 10 Oct 2026 14:46:41 +0200 Message-ID: <20261010124642.927044-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261010124642.927044-1-alexander.ivanov@virtuozzo.com> References: <20261010124642.927044-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v5 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 Reviewed-by: Denis V. Lunev --- 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