From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiRPT-0004a7-3w for qemu-devel@nongnu.org; Tue, 22 Mar 2016 14:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiRPS-0000JV-10 for qemu-devel@nongnu.org; Tue, 22 Mar 2016 14:52:07 -0400 References: <1458072268-53705-1-git-send-email-vsementsov@virtuozzo.com> <1458072268-53705-23-git-send-email-vsementsov@virtuozzo.com> From: Eric Blake Message-ID: <56F1944E.4090808@redhat.com> Date: Tue, 22 Mar 2016 12:51:58 -0600 MIME-Version: 1.0 In-Reply-To: <1458072268-53705-23-git-send-email-vsementsov@virtuozzo.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7ekTvhFEckW4vg8nQCBipfnA94eTDnsMr" Subject: Re: [Qemu-devel] [PATCH 22/22] qcow2-dirty-bitmap: add EXTRA_DATA_COMPATIBLE flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7ekTvhFEckW4vg8nQCBipfnA94eTDnsMr Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 03/15/2016 02:04 PM, Vladimir Sementsov-Ogievskiy wrote: > If this flag is unset and exta data present the bitmap should be s/exta/extra/ s/present/is present/ > read-only. For now just return error for this case. >=20 > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > block/qcow2-dirty-bitmap.c | 8 ++++++++ > 1 file changed, 8 insertions(+) >=20 > diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c > index 159e935..95c166c 100644 > --- a/block/qcow2-dirty-bitmap.c > +++ b/block/qcow2-dirty-bitmap.c > @@ -45,6 +45,7 @@ > #define BME_RESERVED_FLAGS 0xfffffffc > #define BME_FLAG_IN_USE 1 > #define BME_FLAG_AUTO (1U << 1) > +#define BME_FLAG_EXTRA_DATA_COMPATIBLE (1U << 1) > =20 > /* bits [1, 8] U [56, 63] are reserved */ > #define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001fe > @@ -333,6 +334,13 @@ static BdrvDirtyBitmap *load_bitmap(BlockDriverSta= te *bs, QCow2Bitmap *bm, > return NULL; > } > =20 > + if (!(bmh->flags & BME_FLAG_EXTRA_DATA_COMPATIBLE) && > + bmh->extra_data_size !=3D 0) { > + error_setg(errp, "Uncompatible extra data found for bitmap '%s= '", s/Uncompatible/Incompatible/ > + bm->name); > + return NULL; > + } > + > bitmap_table =3D g_try_malloc(bmh->bitmap_table_size * sizeof(uint= 64_t)); > if (bitmap_table =3D=3D NULL) { > error_setg_errno(errp, -ENOMEM, >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --7ekTvhFEckW4vg8nQCBipfnA94eTDnsMr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJW8ZROAAoJEKeha0olJ0NqfB8IAKT2mcbSMh7uFosP+iYHaqLQ 6dzRK8lVGFUm1VVDz8Q94hRvjhefXTHG+mwYzFS1tJ9JgHs8ZFJNTXIfK6KA/YG/ YYwdGcCp8NUyHRetl94Aovg/zjrysCZBVmXJiL76JcABhFR+GS9NGYpTNSY7gawZ KJ+b6Ww1Ven2CNOARZJzIk2oE3Mmcf4RnbZ7jsJGQEpbOq3izh8/orWd1QWMlJeD mqigfh588eylTTa/eAKCHjacsdKdgXjgiIZo4aW0oTufAZhSoWCqNG0NZRWWlQgW g3YWl53TqQfedisvAfReFQtcUC2YkES1EFOGvrWdcyZCGmsYl5eSF35XMQ7KLs4= =mbBa -----END PGP SIGNATURE----- --7ekTvhFEckW4vg8nQCBipfnA94eTDnsMr--