From nobody Tue Feb 10 19:15:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511189550538246.55472659265126; Mon, 20 Nov 2017 06:52:30 -0800 (PST) Received: from localhost ([::1]:57749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGnQu-0006wX-L3 for importer@patchew.org; Mon, 20 Nov 2017 09:52:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGnP1-0005WV-J2 for qemu-devel@nongnu.org; Mon, 20 Nov 2017 09:50:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGnP0-00058i-HJ for qemu-devel@nongnu.org; Mon, 20 Nov 2017 09:50:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48150) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eGnOw-00056r-E6; Mon, 20 Nov 2017 09:50:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C0B15277E; Mon, 20 Nov 2017 14:50:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-185.ams2.redhat.com [10.36.116.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D0654FA20; Mon, 20 Nov 2017 14:50:19 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 20 Nov 2017 15:50:04 +0100 Message-Id: <20171120145006.551-2-kwolf@redhat.com> In-Reply-To: <20171120145006.551-1-kwolf@redhat.com> References: <20171120145006.551-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 20 Nov 2017 14:50:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.11 1/3] block: Add errp to bdrv_snapshot_goto() 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, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Wolf Reviewed-by: Vladimir Sementsov-Ogievskiy --- include/block/snapshot.h | 3 ++- block/snapshot.c | 21 ++++++++++++++++----- qemu-img.c | 6 +++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/block/snapshot.h b/include/block/snapshot.h index e5c0553115..aeb80405e8 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -57,7 +57,8 @@ int bdrv_can_snapshot(BlockDriverState *bs); int bdrv_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info); int bdrv_snapshot_goto(BlockDriverState *bs, - const char *snapshot_id); + const char *snapshot_id, + Error **errp); int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id, const char *name, diff --git a/block/snapshot.c b/block/snapshot.c index be0743abac..9c941e638d 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -177,18 +177,21 @@ int bdrv_snapshot_create(BlockDriverState *bs, } =20 int bdrv_snapshot_goto(BlockDriverState *bs, - const char *snapshot_id) + const char *snapshot_id, + Error **errp) { BlockDriver *drv =3D bs->drv; int ret, open_ret; int64_t len; =20 if (!drv) { + error_setg(errp, "Block driver is closed"); return -ENOMEDIUM; } =20 len =3D bdrv_getlength(bs); if (len < 0) { + error_setg_errno(errp, -len, "Cannot get block device size"); return len; } /* We should set all bits in all enabled dirty bitmaps, because dirty @@ -200,13 +203,18 @@ int bdrv_snapshot_goto(BlockDriverState *bs, bdrv_set_dirty(bs, 0, len); =20 if (drv->bdrv_snapshot_goto) { - return drv->bdrv_snapshot_goto(bs, snapshot_id); + ret =3D drv->bdrv_snapshot_goto(bs, snapshot_id); + if (ret < 0) { + error_setg_errno(errp, -ret, "Failed to load snapshot"); + } + return ret; } =20 if (bs->file) { BlockDriverState *file; QDict *options =3D qdict_clone_shallow(bs->options); QDict *file_options; + Error *local_err =3D NULL; =20 file =3D bs->file->bs; /* Prevent it from getting deleted when detached from bs */ @@ -220,12 +228,14 @@ int bdrv_snapshot_goto(BlockDriverState *bs, bdrv_unref_child(bs, bs->file); bs->file =3D NULL; =20 - ret =3D bdrv_snapshot_goto(file, snapshot_id); - open_ret =3D drv->bdrv_open(bs, options, bs->open_flags, NULL); + ret =3D bdrv_snapshot_goto(file, snapshot_id, errp); + open_ret =3D drv->bdrv_open(bs, options, bs->open_flags, &local_er= r); QDECREF(options); if (open_ret < 0) { bdrv_unref(file); bs->drv =3D NULL; + /* A bdrv_snapshot_goto() error takes precedence */ + error_propagate(errp, local_err); return open_ret; } =20 @@ -234,6 +244,7 @@ int bdrv_snapshot_goto(BlockDriverState *bs, return ret; } =20 + error_setg(errp, "Block driver does not support snapshots"); return -ENOTSUP; } =20 @@ -467,7 +478,7 @@ int bdrv_all_goto_snapshot(const char *name, BlockDrive= rState **first_bad_bs) =20 aio_context_acquire(ctx); if (bdrv_can_snapshot(bs)) { - err =3D bdrv_snapshot_goto(bs, name); + err =3D bdrv_snapshot_goto(bs, name, NULL); } aio_context_release(ctx); if (err < 0) { diff --git a/qemu-img.c b/qemu-img.c index 02a6e27beb..68b375f998 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2989,10 +2989,10 @@ static int img_snapshot(int argc, char **argv) break; =20 case SNAPSHOT_APPLY: - ret =3D bdrv_snapshot_goto(bs, snapshot_name); + ret =3D bdrv_snapshot_goto(bs, snapshot_name, &err); if (ret) { - error_report("Could not apply snapshot '%s': %d (%s)", - snapshot_name, ret, strerror(-ret)); + error_reportf_err(err, "Could not apply snapshot '%s': ", + snapshot_name); } break; =20 --=20 2.13.6