From nobody Sun Apr 28 22:48:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1574882852; cv=none; d=zohomail.com; s=zohoarc; b=YJwgRLr3I9oNTnv9HsfiYaplmZJEnRZg1D3NZaGu/KgYa/9I4gupUnG2TwDLnHqmIBdTz9lpuNVVqZMyMfgQ2g1McSA3NvEU81etq2rrJvLC90GkFiJRIhhqtIeM2F7Vgy1Ns36Oc+7pDBewEytmJ/kS8z3miqHdFS3gEPEH7uA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574882852; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=XAokV99Eht/uwVAVPIBFq38v3mtKn2SQhEHRqVmTVTs=; b=oAGpmmuPbWDL4/tNUXQ60EBJaGaFGi1/XzmI/hVhSva0Xi4N3s8WuG5MTnCheJ2r8OleoJxS7xraJvgg3LmpMYofdwtaWaR+G68iA//Gj3pLzXB9Yg/Pj7YljouM/gJ5a1F4AQ9zfMoMxUcnep4X8y1mR6VjZZYkh6Mx/VVWCEg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15748828521211016.1594167744458; Wed, 27 Nov 2019 11:27:32 -0800 (PST) Received: from localhost ([::1]:42166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2yI-0007Mq-JH for importer@patchew.org; Wed, 27 Nov 2019 14:27:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39084) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2x0-0006rO-Lm for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2wy-0007Do-7y for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:26:10 -0500 Received: from relay.sw.ru ([185.231.240.75]:54182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2ww-0007AR-Ev for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:26:06 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia2wo-00047e-68; Wed, 27 Nov 2019 22:25:58 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v6] block/snapshot: rename Error ** parameter to more common errp Date: Wed, 27 Nov 2019 22:25:58 +0300 Message-Id: <20191127192558.22013-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- v6: merge corresponding header change here, so, v6 is merge of [RFC v5 011/126] block/snapshot: rename Error ** parameter to more common= errp and [RFC v5 019/126] include/block/snapshot.h: rename Error ** parameter to m= ore common errp both has Eric's r-b, so I keep Eric's r-b for the merge include/block/snapshot.h | 2 +- block/snapshot.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/block/snapshot.h b/include/block/snapshot.h index b5d5084a12..2bfcd57578 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -78,7 +78,7 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState= *bs, =20 bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs); int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bs= d_bs, - Error **err); + Error **errp); int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_= bs, Error **errp); int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_= bs); diff --git a/block/snapshot.c b/block/snapshot.c index 8081616ae9..bd9fb01817 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -426,7 +426,7 @@ fail: } =20 int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_ba= d_bs, - Error **err) + Error **errp) { int ret =3D 0; BlockDriverState *bs; @@ -441,7 +441,7 @@ int bdrv_all_delete_snapshot(const char *name, BlockDri= verState **first_bad_bs, bdrv_snapshot_find(bs, snapshot, name) >=3D 0) { ret =3D bdrv_snapshot_delete(bs, snapshot->id_str, - snapshot->name, err); + snapshot->name, errp); } aio_context_release(ctx); if (ret < 0) { --=20 2.21.0