Re: [Qemu-block] [Qemu-devel] [PATCH RFC 1/2] block: Limit opening of encrypted images to qemu-img

[Markus Armbruster]

"Daniel P. Berrange" <address@hidden> writes:

> On Tue, Mar 10, 2015 at 06:26:39PM +0100, Markus Armbruster wrote:
[...]
>> diff --git a/include/block/block.h b/include/block/block.h
>> index 649c269..76b6d3c 100644
>> --- a/include/block/block.h
>> +++ b/include/block/block.h
>> @@ -76,6 +76,7 @@ typedef enum {
>>  #define BDRV_O_PROTOCOL    0x8000  /* if no block driver is explicitly 
>> given:
>>                                        select an appropriate protocol driver,
>>                                        ignoring the format layer */
>> +#define BDRV_O_CRYPT_OK    0x10000 /* open even when image is encrypted */
>>  
>>  #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | 
>> BDRV_O_NO_FLUSH)
>>  
>> @@ -382,8 +383,6 @@ BlockDriverState *bdrv_next(BlockDriverState *bs);
>>  int bdrv_is_encrypted(BlockDriverState *bs);
>>  int bdrv_key_required(BlockDriverState *bs);
>>  int bdrv_set_key(BlockDriverState *bs, const char *key);
>> -void bdrv_add_key(BlockDriverState *bs, const char *key, Error **errp);
>
> Nitpick, this method isn't deleted until your next patch, so this belongs
> there.

Will fix, thanks!

>> -int bdrv_query_missing_keys(void);
>
> Fun, a method which doesn't even exist :-)

Extra fun: it never existed, yet this line is six years old :)

[..]