[PATCH for-9.0] qapi: drop unused QCryptoBlockCreateOptionsLUKS.detached-header

Daniel P. Berrangé posted 1 patch 1 month, 1 week ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240319153908.194975-1-berrange@redhat.com
Maintainers: Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>
qapi/crypto.json | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
[PATCH for-9.0] qapi: drop unused QCryptoBlockCreateOptionsLUKS.detached-header
Posted by Daniel P. Berrangé 1 month, 1 week ago
The 'detached-header' field in QCryptoBlockCreateOptionsLUKS
was left over from earlier patch iterations.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qapi/crypto.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qapi/crypto.json b/qapi/crypto.json
index 931c88e688..ad9e3d0297 100644
--- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -226,8 +226,6 @@
 # @iter-time: number of milliseconds to spend in PBKDF passphrase
 #     processing.  Currently defaults to 2000. (since 2.8)
 #
-# @detached-header: create a detached LUKS header. (since 9.0)
-#
 # Since: 2.6
 ##
 { 'struct': 'QCryptoBlockCreateOptionsLUKS',
@@ -237,8 +235,7 @@
             '*ivgen-alg': 'QCryptoIVGenAlgorithm',
             '*ivgen-hash-alg': 'QCryptoHashAlgorithm',
             '*hash-alg': 'QCryptoHashAlgorithm',
-            '*iter-time': 'int',
-            '*detached-header': 'bool'}}
+            '*iter-time': 'int' }}
 
 ##
 # @QCryptoBlockOpenOptions:
-- 
2.43.0


Re: [PATCH for-9.0] qapi: drop unused QCryptoBlockCreateOptionsLUKS.detached-header
Posted by Markus Armbruster 1 month, 1 week ago
Daniel P. Berrangé <berrange@redhat.com> writes:

> The 'detached-header' field in QCryptoBlockCreateOptionsLUKS
> was left over from earlier patch iterations.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  qapi/crypto.json | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/qapi/crypto.json b/qapi/crypto.json
> index 931c88e688..ad9e3d0297 100644
> --- a/qapi/crypto.json
> +++ b/qapi/crypto.json
> @@ -226,8 +226,6 @@
>  # @iter-time: number of milliseconds to spend in PBKDF passphrase
>  #     processing.  Currently defaults to 2000. (since 2.8)
>  #
> -# @detached-header: create a detached LUKS header. (since 9.0)
> -#
>  # Since: 2.6
>  ##
>  { 'struct': 'QCryptoBlockCreateOptionsLUKS',
> @@ -237,8 +235,7 @@
>              '*ivgen-alg': 'QCryptoIVGenAlgorithm',
>              '*ivgen-hash-alg': 'QCryptoHashAlgorithm',
>              '*hash-alg': 'QCryptoHashAlgorithm',
> -            '*iter-time': 'int',
> -            '*detached-header': 'bool'}}
> +            '*iter-time': 'int' }}
>  
>  ##
>  # @QCryptoBlockOpenOptions:

Glad you caught this in time.

Acked-by: Markus Armbruster <armbru@redhat.com>