From nobody Sat Feb 7 06:20:47 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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=1555946740; cv=none; d=zoho.com; s=zohoarc; b=dtwqE5iA14M7B85zptmpHeK5lkBZoCQ9xqv94sU7HDcTrWDDCZl9up0ggeBaO4iwB0bn4gMsUWLWjcd40gnLLvWV2GKrKptw4MgHcj2bswPjIzjJvlGEI00DdlJ2r8D6W74NrkgwU5q8Kcd+q9egGMrO+duxPpBLE8s3IgOk9ww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555946740; 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=oUXW5oZuJ9KihRvvteR0cflwf95bH22CDuMrFG/eElJN/k8XF8LJGY+vtUBw8MDBSRnXiJDAOJkvCIBF9lCTrDmsNKTw/OI9ovMv9NgRthi9n5vcysqNCoxDlHM4l3fZHwlAdP5qH/zGnuVrwbHFrqzgjrB4M0GDgiixI26qWSc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555946740801556.7911572479551; Mon, 22 Apr 2019 08:25:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:38785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIaos-0006b8-TH for importer@patchew.org; Mon, 22 Apr 2019 11:25:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIamv-0005La-Ds for qemu-devel@nongnu.org; Mon, 22 Apr 2019 11:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIamu-0006Gk-8I for qemu-devel@nongnu.org; Mon, 22 Apr 2019 11:23:21 -0400 Received: from relay.sw.ru ([185.231.240.75]:56460) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIamu-0006FX-0Z; Mon, 22 Apr 2019 11:23:20 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hIamr-0003vg-29; Mon, 22 Apr 2019 18:23:17 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 22 Apr 2019 18:23:13 +0300 Message-Id: <20190422152315.74361-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190422152315.74361-1-vsementsov@virtuozzo.com> References: <20190422152315.74361-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 v4 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