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 2A83680C1B for ; Thu, 22 Oct 2026 12:18:58 +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 69MCHZBl008135; Thu, 22 Oct 2026 15:17:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69MCHZBl008135 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="n8fAoCFT" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69MCHJeu008076 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 22 Oct 2026 15:17:19 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69MCHJeu008076 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48af4046a3bso1761888f8f.2 for ; Thu, 22 Oct 2026 05:17:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBzcyAZcHB3sBCZdvSYa94byTyTDUfO7T8El36gXM/MilQvyfUVVDVFAhnHI3fgwTrcKRVS00Q==@openvz.org X-Gm-Message-State: AFq9FYIB/0w8jIst0zqLTii0n8qFdSFNBiFxClAyqdMVpre2j3i4ZrvG oBqEzJyqpRHv/iO1lGYXfB6BS5ZKeVlbeXbpnUry1+nuJMl6id4aJRNzG4h/ppjmVh+w/YLGjRu azqvBk7tJne15K2IsZ1LMLHm+mNXQ+ZH15jJX4otheN0PwKgSqSbWxA== X-Gm-Gg: AYBFou16vxt3qZ6Tu88Bym8TtvqhJJoX5wWAoxaQa7DKKkqoRPeF4aEdknCrjZYqoqF jytsnsfBvtYIMCQ5Go1Vd+IkdlCvgUBg6CiQDZbkhN6Bhx5SNlrvvY83Nl0XMlbswrlvx0+rKrt a3vmpl1jPUCqu3xU56yfC+PURWep97ccGqOlch8VAn4l/iMclfU8De//sYbuu7dotzg5cErLCzh oLks6rk/v8zAzfF+Ekk6OmBP8VWzybgDcTtS2vcQyHvhkhPqbvijBVqhYSM77bzBQK6+gu0+bCY NtSAaNFe7m+yTnqO/Lwt4zkJdEdihBmjCAcY7RiWeCVNKTTGgcj2RD/prfEO0LuEznGokYC63vh WFQp7SAFKtKvGTDOeiJK//iOO1X1Y X-Received: by 2002:adf:e007:0:20b0:48d:f215:48d8 with SMTP id ffacd0b85a97d-48e264b147fmr7577697f8f.27.1792671438767; Thu, 22 Oct 2026 05:17:18 -0700 (PDT) X-Received: by 2002:adf:e007:0:20b0:48d:f215:48d8 with SMTP id ffacd0b85a97d-48e264b147fmr7577669f8f.27.1792671438163; Thu, 22 Oct 2026 05:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1792671438; cv=none; d=google.com; s=arc-20260327; b=TL9ER7LyJZyhdpd8MKcTE/YGRSlYXNYJaCShVppObF+5W45dPaSduCo/XnFkoK8v2F ZBjZxQOGP8VZIAEUki5rXOXDGluv+MSRSKW+h02pEIqYfjHdbiuQQJK0XMHfkXwYGsTQ NXrmtuT+zc2aWzpukD9Oa54Am7vjmY3y5W+4CgYz/1H5++zh+0APApLpdfOAV4Va0Iu2 yLIS//b1kugb25PgFCwbTdsRG/zMicL2wQ00lfGsodK3AgD+O2frzcXp/FNbVV/SLPVZ oWhPHv7LsyDedJ2fg+QtXCTJ3L2avjt+zBDPzXxw/D+zJcxoIWc4dFZHLkRzrXPfADNn bO3g== 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=bhBZo/JS7kySG8PJUfRVz2ouqMmHOG8IAYTi2tczRL4=; fh=1MEQxOGYABaQPNQS1Ckioh0rrUOwgCYjd8t5csgx5as=; b=m9QOJKnGhG/8oxRU6mpV7fg2qyTulnD7xue3VZP9DC/uvml4otV9oFxRPQ6kV8BvAM 4DMeGSjKYgkdcpXX+gj/1Wb8EMBOQZP8IFDNeMnZsG1sjlSrKPnDYAUe+teCB2TgAq5o zIIwOniZYUslHhKtnp1IfVIbhRTMwgK8lM6UAEhEJMp0BMj1NfNsZN9ormtLWDF1qXKx OzWfM6PnMu/7RAbTMW9SGhOUXxH839+1GlVpPA+c7VQAbB9JvfS4bx4RVNEMS5Ng7hJf RZ0jXiuoh9d9upxwSX8gbzoQWcDTsLe4Jcr2GHgA/q8ttlJ1rnHwEQHJASJOfB8+PBME oMSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=n8fAoCFT; 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-48e2587935asi10363509f8f.332.2026.10.22.05.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 05:17:17 -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=n8fAoCFT; 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=bhBZo/JS7kySG8PJUfRVz2ouqMmHOG8IAYTi2tczRL4=; b=n8fAoCFTc79p hblIOgGQebP6DjSPXU52Pep5GLCAat9V8UON3+dL72oINrvwQCrB43B0Cpzsk1aPzP88rwg+/mvXl TGflaAEYDdBVkzeWHl+VOBUV9pTMFKk7n/76UFKd//NbVlS0ssS2zDGLknp51yvT07ny+AUPWsuDR 7VBr0XuW+leHMICFJbJ+USHQilyDGhyIZ+GCH2UqF+Y9EMcObmN+vVKXnKGuULgu58L3DheGcXrFN dRVerk0Vl7KxdNJDAIbmGQXGz4z+RcY8ut7HxDWGmzZzLNnpeD15iZ617BKxdAZJ85dMN5RFRsPvD A0gjctrdvGS8VRJfmlRx4A==; 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 1xJrfo-00Dc1n-09; Thu, 22 Oct 2026 14:17:14 +0200 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Thu, 22 Oct 2026 14:17:02 +0200 Message-ID: <20261022121706.1890593-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261022121706.1890593-1-alexander.ivanov@virtuozzo.com> References: <20261022121706.1890593-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v6 2/6] 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 311a23d63a5c..b667adb5472a 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 parse 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