From nobody Sun Feb 8 20:12:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1556024337; cv=none; d=zoho.com; s=zohoarc; b=VKLgQRFy9yAkiMmtXMPeGsSMKIEjauFeeEeA8mKq5ZPIs6Cixr+23a8hxp2ooZ2kV+h8coYyBuWtJogBbbN6SJUnaIh/gl0GcOfVcGeXDy2FeGZA81FvWIdluJ+fyEYoM2tHLSltohlHIhZs1Bc1MeCu1pi3DqfHUSl9Bb0wSLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556024337; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=stEFUS09P6G2ykvMRhUd9MIPIf9H/JrGmjLgrhaL1aY=; b=WW/yrsWD/LkMUjXYuJZ3NNQCRVbLFvtvKGcEAkjnAzGmXyyoIEhu1LOAOKpGEhIqsI0F7GniSd07ixtLI4tQ4A3anSSJt4R35YAo/0JZSL2FjaTeQ8fckB/kaI41hqV24dme5uFeznyypBxJBsZwGVDJPCviEDytpER+wyqzCOo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155602433712691.6271411231935; Tue, 23 Apr 2019 05:58:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:53412 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIv0Z-0005AJ-P7 for importer@patchew.org; Tue, 23 Apr 2019 08:58:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIuz2-0004J3-Tl for qemu-devel@nongnu.org; Tue, 23 Apr 2019 08:57:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIuz1-0004wo-E2 for qemu-devel@nongnu.org; Tue, 23 Apr 2019 08:57:12 -0400 Received: from relay.sw.ru ([185.231.240.75]:42562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIuz1-0004up-6Y; Tue, 23 Apr 2019 08:57:11 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hIuyw-0001B4-SF; Tue, 23 Apr 2019 15:57:06 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 23 Apr 2019 15:57:04 +0300 Message-Id: <20190423125706.26989-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190423125706.26989-1-vsementsov@virtuozzo.com> References: <20190423125706.26989-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 1/3] block/qcow2-refcount: add trace-point to qcow2_process_discards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, den@virtuozzo.com, mreitz@redhat.com, stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Let's at least trace ignored failure. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/qcow2-refcount.c | 7 ++++++- block/trace-events | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index e0fe322500..60284bcaac 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -30,6 +30,7 @@ #include "qemu/range.h" #include "qemu/bswap.h" #include "qemu/cutils.h" +#include "trace.h" =20 static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size, uint64_t max); @@ -738,7 +739,11 @@ void qcow2_process_discards(BlockDriverState *bs, int = ret) =20 /* Discard is optional, ignore the return value */ if (ret >=3D 0) { - bdrv_pdiscard(bs->file, d->offset, d->bytes); + int r2 =3D bdrv_pdiscard(bs->file, d->offset, d->bytes); + if (r2 < 0) { + trace_qcow2_process_discards_failed_region(d->offset, d->b= ytes, + r2); + } } =20 g_free(d); diff --git a/block/trace-events b/block/trace-events index 7335a42540..ea508f637e 100644 --- a/block/trace-events +++ b/block/trace-events @@ -91,6 +91,9 @@ qcow2_cache_get_done(void *co, int c, int i) "co %p is_l2= _cache %d index %d" qcow2_cache_flush(void *co, int c) "co %p is_l2_cache %d" qcow2_cache_entry_flush(void *co, int c, int i) "co %p is_l2_cache %d inde= x %d" =20 +# qcow2-refcount.c +qcow2_process_discards_failed_region(uint64_t offset, uint64_t bytes, int = ret) "offset 0x%" PRIx64 " bytes 0x%" PRIx64 " ret %d" + # qed-l2-cache.c qed_alloc_l2_cache_entry(void *l2_cache, void *entry) "l2_cache %p entry %= p" qed_unref_l2_cache_entry(void *entry, int ref) "entry %p ref %d" --=20 2.18.0