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 4D55F80C1B for ; Mon, 26 Oct 2026 14:43:51 +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 69QEgbdX011680; Mon, 26 Oct 2026 17:42:38 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QEgbdX011680 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="cxAMnT8u" 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 69QEgS4T011641 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 26 Oct 2026 17:42:28 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QEgS4T011641 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48b027578a4so3009008f8f.3 for ; Mon, 26 Oct 2026 07:42:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBxwRJ0tTrANsiBcaW1G6lXKcBvdahvoDwufJYRElFkAQqPYunR5e97Ua/gLkhvK9/neUjuYJQ==@openvz.org X-Gm-Message-State: AFq9FYI2Ymdasvhdj5BmciFSIJwXcxG0ZRsv+vCJlW72eenAbk7s/fDF W+V//3NdxTs5EWLtOzEAAMI4lcwD9Vslf4X0/uJnuRVrE2xbg9W7Y87FmVbCUc5SZc3bMTLFYv7 3g674Xb+IU/IAsh95gJ+4cMaAb6k18bmpUvWJgpub+iaWySK4q+ETFw== X-Gm-Gg: AYBFou3kGmADyWBKR+YcIBoZop2IC7a/jYFgn6d9BcjYAAvEyyFXtziVjtpm+0n+Mbk ASSdokAtljYLyw3j1OwS3PeuBoQJDqCUZhWZKa/ekU4cnCbWaa2LFyN7Y6aLXLMa/0L5G31ytxf IQ52tJap2axgkCES7iJ0rAOfMnQkNwKnQL5fzMhaOdVF6low6Z4FiezjlEdq6ukwCMn0txcVftj YJ1o2vKXiAfp1LbODaqbkDx8taQh9xLXz57fcniUxSDrTvvBUtEmEBaRYDwVm6TBgeDpm9tOAwc oBrb1TGhdevOKJ3n6OYz60K99qjrlvSH+vdykSLLPEjK73rxHV2yxeK48KuVTxcfBOg/Po6ToKq a+V2h7X9rREnxCmqjKuMQSe/xl/I= X-Received: by 2002:a5d:584f:0:b0:486:e707:42eb with SMTP id ffacd0b85a97d-48e3eb7ac74mr12311005f8f.33.1793025748033; Mon, 26 Oct 2026 07:42:28 -0700 (PDT) X-Received: by 2002:a5d:584f:0:b0:486:e707:42eb with SMTP id ffacd0b85a97d-48e3eb7ac74mr12310949f8f.33.1793025747419; Mon, 26 Oct 2026 07:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793025747; cv=none; d=google.com; s=arc-20260327; b=lPtEYHmeVk8FUnLvCjB04Mihzu6VcGM0Y0U9iMq1dAXhheuSWK3YWHgdYc27I0MC4R ZItKWaMMcQ43mb5DraDbl30QRlNMAsQQAn2xuyRcovofagvz4is07jZAWYkNfE/w4Duw mhQ6hWtGIAnK+96QfQWorDQfFXQDDZlls2waIdgjYgoiKQ0ua3fDKnEbzsSwdctRKaiF 3gZZ+02mXRULCXRbo6ZH1IkMnpzXdYH8K1VJB8DZMNQYWNwoPok5dvaQv3cLwUyZb0gP 87iZdaK6HFNNaOy3gcRjRVjgXdRUUMeJfWqmIEyDbS4Fz0/SoCmdBkS0QucIYBEStCKD +I7w== 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=PLEK/P2DPxsQe+8o2QoqH9LuR11P+MwMfZv7JqiENnnCSvwxnnSBnQYbgaZVKFO+Ae kX2jJgtr/y0U9tzlilg2GbxLOHVtw+F8L2Li7Zc+cO0IPZN3tsNj8hD63xSBk1p05UV3 7zUnwW5n/Aps3MNtLJ/gkspu1CqhgbruixJqHYYU+rOh0G8Rfm77VBHUMSNJVG+vrq7G W9q1LxWNwrxy1jgHMJ3wkhWG8f4pdspID8QUgW7PwyIn5uDHdt7HG2+bgwkDAToNKlZh DiWVd3h2yJcslaz/IXqrGlOavZxU1VLp+KWuiTKDyHNz2ansu9/oKLUgtos3HovcYcUX MtXA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=cxAMnT8u; 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-48e3eb9c52asi15635760f8f.41.2026.10.26.07.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 07:42:27 -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=cxAMnT8u; 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=cxAMnT8u5gRq 41aDMc3sjDdz+2RYPSwoKMAZkSchBrqgo/8dk0D26hlnvmJqdC9g91qPa8OSuy8HOR5MBcARW2aC6 5b1AJdOnjUonVXllYI5/LEckZ//bVO5vNkFMqNBFrO6D5j5qDyrEhwL2O1Zt4GooVf6QZcZ42mTXs 6qmgF4ZipLzeAalufozr5VbZC9l+3o1CdLT0UvjwfVmgG7pkaDmi++QQJ1dAk+ie4D4YOFJuMF7/4 sIjqvxsiI0ZUFLee9q8axyhWjCxRevwhKBTYD7JNXznNrVgAB9LDdeGyInsRFmFZ8hguRMeWu5JgC 0uAslhzDl4mYsoUvddGX+w==; 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 1xLLqN-004nT9-2E; Mon, 26 Oct 2026 15:42:18 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 26 Oct 2026 15:42:19 +0100 Message-ID: <20261026144223.2787145-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261026144223.2787145-1-alexander.ivanov@virtuozzo.com> References: <20261026144223.2787145-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v8 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