From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrRFh-0001ux-33 for qemu-devel@nongnu.org; Wed, 28 Oct 2015 09:58:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrRFf-0001Qf-Ri for qemu-devel@nongnu.org; Wed, 28 Oct 2015 09:58:57 -0400 References: <1445267389-21846-1-git-send-email-berrange@redhat.com> <1445267389-21846-8-git-send-email-berrange@redhat.com> <56257CD4.2010407@redhat.com> From: Eric Blake Message-ID: <5630D499.1020909@redhat.com> Date: Wed, 28 Oct 2015 07:58:49 -0600 MIME-Version: 1.0 In-Reply-To: <56257CD4.2010407@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LxervQuBHUWHMoGRbXL1nVlaFS6REo1J3" Subject: Re: [Qemu-devel] [PATCH 07/17] qcow2: add a 'keyid' parameter to qcow2 options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Kevin Wolf , Josh Durgin , Ronnie Sahlberg , qemu-block@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Paolo Bonzini This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LxervQuBHUWHMoGRbXL1nVlaFS6REo1J3 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/19/2015 05:29 PM, Eric Blake wrote: > On 10/19/2015 09:09 AM, Daniel P. Berrange wrote: >> Add a 'keyid' parameter that refers to the ID of a >> QCryptoSecret instance that provides the encryption key. >> >> $QEMU \ >> -object secret,id=3Dsec0,filename=3D/home/berrange/encrypted.pw \ >> -drive file=3D/home/berrange/encrypted.qcow2,keyid=3Dsec0 >> >> Signed-off-by: Daniel P. Berrange >> --- >> block/qcow2.c | 80 +++++++++++++++++++++++++++++++++++++------= --------- >> block/qcow2.h | 1 + >> qapi/block-core.json | 8 ++++-- >> 3 files changed, 64 insertions(+), 25 deletions(-) >> >=20 >> +++ b/qapi/block-core.json >> @@ -1567,7 +1567,7 @@ >> # Driver specific block device options for qcow. >> # >> # @keyid: #optional ID of the "secret" object providi= ng the >> -# AES decryption key. >> +# AES decryption key (since 2.5) >=20 > Looks like this line... >=20 >> # >> # Since: 2.5 >> ## >> @@ -1611,6 +1611,9 @@ >> # caches. The interval is in seconds. The def= ault value >> # is 0 and it disables this feature (since 2.= 5) >> # >> +# @keyid: #optional ID of the "secret" object providi= ng the >> +# AES decryption key. >=20 > ...and this line should be swapped. >=20 Also, do you want to change BlockdevOptionsQcow2 to have a base class of BlockdevOptionsQcow, and get keyid by inheritance rather than by direct declaration? Doesn't matter in the long run (once my qapi patches land that provide the information without going through an extra 'base->' laye= r). --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --LxervQuBHUWHMoGRbXL1nVlaFS6REo1J3 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/ iQEcBAEBCAAGBQJWMNSaAAoJEKeha0olJ0NqlFsH/1Bs0kq0RyMSFMSPQrpMW8yG yVGPpA3aUrjECF3wNW+3vVmvffv9fW+Vg66ftmpLLgm+x3uGzkRpjd1uNW7q9gWn azJltRzyru2BL1Pk7fcWLnSNStAVnZgwFHgmlaRnVSKTQ6k9g/SNQs/mQmZft89+ d/7fKpZ8/BZL2Z8vVTPG1Kc6P6l6PAWeVUcnvmhHfCYUZSLFE1vwkMWyPBEM+gcM p3AR83mN83dMiWTTnjGUqCmH/yphb6GkoBdz21GscITiROsQ5uj2YgTZfcN3H6wG dJelZGa6sgGgRoKmqOlOzyvWvPUyQPTps5/Fj/AH+XJSpWj7WyKMUtXs9dAzvPU= =RW5q -----END PGP SIGNATURE----- --LxervQuBHUWHMoGRbXL1nVlaFS6REo1J3--