From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvqE5-0001G4-8g for qemu-devel@nongnu.org; Mon, 09 Nov 2015 12:27:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvqE1-0003vE-VD for qemu-devel@nongnu.org; Mon, 09 Nov 2015 12:27:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvqE1-0003um-Q7 for qemu-devel@nongnu.org; Mon, 09 Nov 2015 12:27:25 -0500 Date: Mon, 9 Nov 2015 17:27:22 +0000 From: Stefan Hajnoczi Message-ID: <20151109172722.GB29494@stefanha-x1.localdomain> References: <1446911700-16803-1-git-send-email-den@openvz.org> <1446911700-16803-6-git-send-email-den@openvz.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mojUlQ0s9EVzWg2t" Content-Disposition: inline In-Reply-To: <1446911700-16803-6-git-send-email-den@openvz.org> Subject: Re: [Qemu-devel] [PATCH 05/10] snapshot: create bdrv_all_find_snapshot helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Kevin Wolf , qemu-devel@nongnu.org, Juan Quintela --mojUlQ0s9EVzWg2t Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Nov 07, 2015 at 06:54:55PM +0300, Denis V. Lunev wrote: This: > +int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs) > +{ > + QEMUSnapshotInfo sn; > + int err = 0; > + BlockDriverState *bs = NULL; > + > + while (err == 0 && (bs = bdrv_next(bs))) { > + AioContext *ctx = bdrv_get_aio_context(bs); > + > + aio_context_acquire(ctx); > + if (bdrv_is_inserted(bs) && !bdrv_is_read_only(bs)) { > + err = bdrv_snapshot_find(bs, &sn, name); > + } > + aio_context_release(ctx); > + } > + > + *first_bad_bs = bs; > + return err; > +} and this: > @@ -1500,21 +1489,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict) > available_snapshots = g_new0(int, nb_sns); > total = 0; > for (i = 0; i < nb_sns; i++) { > - sn = &sn_tab[i]; > - available = 1; > - bs1 = NULL; > - > - while ((bs1 = bdrv_next(bs1))) { > - if (bdrv_can_snapshot(bs1) && bs1 != bs) { > - ret = bdrv_snapshot_find(bs1, sn_info, sn->id_str); > - if (ret < 0) { > - available = 0; > - break; > - } > - } > - } > - > - if (available) { > + if (bdrv_all_find_snapshot(sn_tab[i].id_str, &bs1) == 0) { > available_snapshots[total] = i; > total++; > } is not equivalent. hmp_info_snapshots() skips devices that are inserted and writeable but do not support snapshots. The new code will fail in that case. --mojUlQ0s9EVzWg2t Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJWQNd6AAoJEJykq7OBq3PI7OQH/iX52cAxXUlrcPeobqOCF+Bz Ncd3AxcMa+H82W8NdUt3NcPxD2950ciZIO1eEJv7/QyxWsr/jW8NzkCkYQw5PHtY +SyImuYB//JPKIHYVDPV4s9LwDzd+RmUFwXq5tpaTScHH+j9JIh/5w4Y/KszPTVC iFxqtsSVqpIG7MQF4APeYopJFCUnho8LVvBx5L/vyU9XipMHhexzDW7E0zQXyoPh 9ZSMdAN1tvXuTsLIntGxhxkpFZhZ6SOhMqCr9RwSywubgKWLKp1AxqKccwSITGGP Z6mD017x1Efp/oJVCwMDYJXRCetJQdtO15IhJkamFStLhHjnzxTsQvTv913eZ38= =BByP -----END PGP SIGNATURE----- --mojUlQ0s9EVzWg2t--