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 8FB7D80E7E for ; Mon, 9 Nov 2026 14:03:14 +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 6A9E1sDs032541; Mon, 9 Nov 2026 17:01:55 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A9E1sDs032541 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="cipgq4hi" 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 6A9E1lt7032496 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 9 Nov 2026 17:01:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A9E1lt7032496 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4a318cd95e8so7735725e9.0 for ; Mon, 09 Nov 2026 06:01:47 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErHBF1il4swxW2D73aeQt58eathaq6Tk4fnsJBb2nTE8BXGeZwS+ZXJs7UN3175OObUMCL92ZQ==@openvz.org X-Gm-Message-State: APuU4Z940ZmbpJ1BNR030b9WXLD925INLXyS5CUTsD4JcYdMan9FoC/c gGeuDmpe9q9hZY0O1HapfY1sIfariGaRqBGhmRNo1dDrJ6SDl9Vspkzy9GQ3dE4rcGI7HLq6ef/ oFL+bMM9fd+wJJuWcM2NNVNA5p5ovpVh3gyza6tSIKFFkT5oo5IV68g== X-Gm-Gg: AYBFou2vaqLKyYaZAPUErDsKCjVvasgwpcmSA/JuCa608aG5BNx+if4foxC0Rc4UcSI /J4Mhn4oHk8oifs7n+59Llp/9pIh68B4uGc+sOKH3I1ZeGECbSQBpxmdMzWqFX1+se7v04I1pcv TOvGm3ToNCM7k713aXW2myEr4g69w2uLfB9grV/8BQtzjn0N3kNaPU9/LL/0rP4WG+B7J5LVY2h ZBHtt+7Xj27XWNL6m2RrDNar/kmXLrG9mVb7YVwQKovemMtoNJ3v5FfR5VwYz/v8MbR0WAvbA5T hWXD/AokVlszq1zuUMHoZY6YgzNW+w5nAJwUxo3RRjexdbr4reb+6m/kJ0ZwnVlqlTCFmJmtqMF FsyyMhb0jKy0dtubUWE/Pu1UdKZdI X-Received: by 2002:a05:600c:4c1a:b0:4a1:d49e:9ce with SMTP id 5b1f17b1804b1-4b8190ef122mr88926455e9.2.1794232906919; Mon, 09 Nov 2026 06:01:46 -0800 (PST) X-Received: by 2002:a05:600c:4c1a:b0:4a1:d49e:9ce with SMTP id 5b1f17b1804b1-4b8190ef122mr88925955e9.2.1794232906367; Mon, 09 Nov 2026 06:01:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794232906; cv=none; d=google.com; s=arc-20260327; b=Zw9L5RKLNNufAdkQR3XadP3qB2siTui0ndeS+Gt6m5B0ufhv2OkI9GWqRWqOizJFgc 5ZIjfts9Ys5ij2jwkCMAdPXF/dfeh4gUXEDkT+wVrNlOWXHv1P8vqopogBTqm+/X5UFS vRv1ZJPhObuPFW1pwA+Ik64mMuz4jd6jVBxFwS7jHBKiPBPVNH5fjw6aN2lMqJjcErH7 AjcgERSmPzFCkhqKc5+o44eokW1heeDiZ0GchiZLP79R49BBNHjqbSSq+9mgTRpltJ5F T9JscgbDUUVIObZmOxq29/I3Z6xAkOV++e8+Q4wLn4OjmaKk4+8M+bNJrOo2pG8FJrlQ 496w== 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=jDIuTvQFYrVNQZAvKJX7H9A3HlzO1T9zSLhKW/Wj/MtWkl7845qLtJDb+jzgxKJ8Qx bz3udyvj8c06VVCL6f36G9PnuvKNN2qxEoCjVZiMc5ZDdNr7T/92Pvj6R15DlE/6+Q3/ Yb9rTYP+QYvcDubejEalQPktbnmRE53SGBFCI7XD6dN2Q0Wpufovynl+LyrkJhNSnCTu aXqFZynusCrcIT0xM8NM0KJd+lm/6F6Pg9+EXU9fAhp++CTgG6812fRxdV8VCmWGx12b BHgBju7OyTPhl0F2su9dmrxk6ICVDDzIY6RxrlnpqNdeCSANuxe/0a+Mp7fqW9eZSfzR SvrA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=cipgq4hi; 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-49597652f3dsi9263519f8f.207.2026.11.09.06.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 06:01:46 -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=cipgq4hi; 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=cipgq4hifrFD kcthyLv8AA1cLS7OUm4hdnDZI/l4UVA2zmCp5J8H4NxFtStk27zwMWDQnAWo/vMOihsnoHUTPrR72 6d4R2vTCLqbkWcnDqTHvbEGoUQoQpzIAVKSciozDBV+6R5xWs/J4IwO1R9GaIP1CkP6GcQG9s/lyX ITqcjuHGLwIkBdbK1FBbMliCTy8Wybn7qM6aocjSr7Qk0eFd42R+QVITAKdYapprrF5YdAi1dhjyk x22I8dUl0hJr4sSN9btkjd3r4xbjCjezUZ63GbCk4XngVhCFDMwK50PTIVrarjjXWLBUBhQVORJOL d02YH08TK4h5jx61/ohUNQ==; 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 1xQPsL-005vFF-1P; Mon, 09 Nov 2026 15:01:37 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 9 Nov 2026 15:01:35 +0100 Message-ID: <20261109140143.1408038-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109140143.1408038-1-alexander.ivanov@virtuozzo.com> References: <20261109140143.1408038-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v11 02/10] 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