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 5AC81802A5 for ; Thu, 8 Oct 2026 10:06:17 +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 698A4vJZ022686; Thu, 8 Oct 2026 13:04:58 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698A4vJZ022686 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="OeW6xanC" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 698A4tQl022672 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 13:04:56 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698A4tQl022672 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a028616bebso41046995e9.1 for ; Thu, 08 Oct 2026 03:04:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBwrbyzrFPY2eIbTwI5+JGa/k0fg8aefJvGGDxMKapWixzTKhurrhAKCIybPgOyb6uOUdAul1A==@openvz.org X-Gm-Message-State: AFuF++mmmNTimaHK6orA1YRxp1ItwLAnfTWL1rFFhIuyKocsQxvKLugJ p4j+IM05YYWLVFlj+6Eb2itub+DbM5iz4NaXUS4mBA3RONVJwNXX9wXZ1NnBzYD7Z4T+gsN1B1X 2zdyeWPCgqGH15z6uQTwwYieegavKtmzyBnDQ4jY9WK7a4c2x3XSORQ== X-Gm-Gg: AYBFou02NWvdCQd5Z3D8BhxepWw8jG9FWObBvzSOZlcGInI4/eZZEGlYslNNBq+fqEZ R3U7+KDjbwcSwoNd/LQ+4xzIm7oP2hSpf2rtRj16wwnVCeQdD28c+lH5rHnSwjLhhJwfAjekeGS xxSOweYRDOTvyCjQJcyYl3tfhth5n9lg00sUp7FqP9PEt59GcD2xUYcdYcj3szmZ817+oYanA8d FRhHSW5bHLz07MKUzLPn6AUH8OaSAoi92dVq1wYa6AQI5nbomZoRhy7DyZ8Xfb01KkJkOJh4U21 yV7MNWb9XfR5J0ImWVp0d8l310qIuV+8OMlTt/S5KRC9YR561bLaGo7w+Ri8JcevfImDJ7Gx4is HOrzH2ILiMjCDTNsBJL0x184gixWb X-Received: by 2002:a05:600c:609a:b0:4a0:1c43:3c04 with SMTP id 5b1f17b1804b1-4a180313b72mr82392785e9.13.1791453895347; Thu, 08 Oct 2026 03:04:55 -0700 (PDT) X-Received: by 2002:a05:600c:609a:b0:4a0:1c43:3c04 with SMTP id 5b1f17b1804b1-4a180313b72mr82392155e9.13.1791453894669; Thu, 08 Oct 2026 03:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791453894; cv=none; d=google.com; s=arc-20260327; b=CwOdKHISY13kH+hfGICyMWscqWWMPIX+P/jD80ZhFG3AY9fove+XzbgqB1o7ikZMav 7vqs+5XZo6+M5BSfr3xTM+BgovbI/a8CyP4EJfRpaehy4Nky/iSVCM1gX4z8O9kper6Q DMR8mNfmdOTw2JGKC2NJjn8AKFS7VygFRaUHZmclUgBtKuKzH6NaF+V7rTM6RFctYWfh pq6s2iAeanZXNaHg9eFiQtM2HPP3pnQ9WCD+CjfxwUN07ISXRGTk71JfYut1VsIPJFtw BKTTFgVxSgC2IvQiPl+rfwtt4IP+TjuZZw0C+NOp/E+vwyNOSOyDtukgzOaZYD0qzjY1 Wpzg== 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=ws1MXyHnxerPdx2ehkXyOlGY6C4Jr+p8pW1FIZA1hdw=; fh=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=lYnrvOw4HDOKL3VwJJ4I3PyC+R/X8iC2umQoBSyTU/cv4tsPWHahR6umxF3XvrR0kI 2PR3fXYAiiar5AZzeD1PnMjx/earbGwNnxWZRA1ubeHXodNNY0jByRfAycxq3QYUmEth LB5u7TuENxNgz3bMT78osHvSsnRAyXR87nLEKztf4U8FIITocdEuKFkvmzwophOoqIOQ 3/X6LImUvLODnG3QAvOR2dJCnfP2V6A1570LmrwVd+TCRh6ot2p/1/ctrxBoHxIdojOw HKVdoYD8JMZMPalB/4NqZr4oUTudMz68qutHMkQELL1JywASbZayq3Hkc/7PrvXb3pMV zCYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=OeW6xanC; 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-4a1843d38e3si42574945e9.7.2026.10.08.03.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 03:04:54 -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=OeW6xanC; 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=ws1MXyHnxerPdx2ehkXyOlGY6C4Jr+p8pW1FIZA1hdw=; b=OeW6xanC4MuU eDB9DbpFCf76x2TD+AoXqRTIAMfqXUM39p4xxZ99gWDEZJu2dHu240QvqjiuO2CQHjNcvqhRnWFab KzQdpFEQ4ntH8/ZuefXU5I/A1c+IuP7aWm+bgBZIbsAjK/HAFT4bwhNaR+joTq671stDZpb61w3LB LCM7u1hk28oktGGnMCGntRRTU6dMQIp6B9QokAD7KNiip2qLw7slBvmGWcFmWv5JwRLFTaMdsAYoE tL60SWZKlGa1cmT0zgKgXSchWsW/iry4eiSDTv9hTtippwT8XbiItyzjOuAg1H3oXfm6H97JQz4fA bt3WWruu4lFVRYlXeOPsMQ==; 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 1xEkwM-00Aash-1n; Thu, 08 Oct 2026 12:04:52 +0200 From: Alexander Ivanov To: den@openvz.org Date: Thu, 8 Oct 2026 12:04:48 +0200 Message-ID: <20261008100449.550882-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008100449.550882-1-alexander.ivanov@virtuozzo.com> References: <20261008100449.550882-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 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 3e47e66b4007..b3d5d5e8c7c2 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; } @@ -829,19 +829,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; @@ -874,7 +874,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; @@ -905,14 +905,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 */ } } @@ -934,11 +934,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; } } @@ -971,7 +971,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; } @@ -1052,7 +1052,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; } @@ -1138,7 +1138,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) @@ -1147,7 +1147,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; } @@ -1168,7 +1168,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