The HTTPs curl block driver is a superset of the HTTP driver, reflect
that in the QAPI.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Antoine Damhet <adamhet@scaleway.com>
---
 qapi/block-core.json | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index b82af7425614..a7871705fa69 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -4595,23 +4595,14 @@
 # Driver specific block device options for HTTPS connections over the
 # curl backend.  URLs must start with "https://".
 #
-# @cookie: List of cookies to set; format is "name1=content1;
-#     name2=content2;" as explained by CURLOPT_COOKIE(3).  Defaults to
-#     no cookies.
-#
 # @sslverify: Whether to verify the SSL certificate's validity
 #     (defaults to true)
 #
-# @cookie-secret: ID of a QCryptoSecret object providing the cookie
-#     data in a secure way.  See @cookie for the format.  (since 2.10)
-#
 # Since: 2.9
 ##
 { 'struct': 'BlockdevOptionsCurlHttps',
-  'base': 'BlockdevOptionsCurlBase',
-  'data': { '*cookie': 'str',
-            '*sslverify': 'bool',
-            '*cookie-secret': 'str'} }
+  'base': 'BlockdevOptionsCurlHttp',
+  'data': { '*sslverify': 'bool'} }
 
 ##
 # @BlockdevOptionsCurlFtp:
-- 
2.53.0

Antoine Damhet <adamhet@scaleway.com> writes:

> The HTTPs curl block driver is a superset of the HTTP driver, reflect
> that in the QAPI.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Antoine Damhet <adamhet@scaleway.com>
> ---
>  qapi/block-core.json | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index b82af7425614..a7871705fa69 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -4595,23 +4595,14 @@
>  # Driver specific block device options for HTTPS connections over the
>  # curl backend.  URLs must start with "https://".
>  #
> -# @cookie: List of cookies to set; format is "name1=content1;
> -#     name2=content2;" as explained by CURLOPT_COOKIE(3).  Defaults to
> -#     no cookies.
> -#
>  # @sslverify: Whether to verify the SSL certificate's validity
>  #     (defaults to true)
>  #
> -# @cookie-secret: ID of a QCryptoSecret object providing the cookie
> -#     data in a secure way.  See @cookie for the format.  (since 2.10)
> -#
>  # Since: 2.9
>  ##
>  { 'struct': 'BlockdevOptionsCurlHttps',
> -  'base': 'BlockdevOptionsCurlBase',
> -  'data': { '*cookie': 'str',
> -            '*sslverify': 'bool',
> -            '*cookie-secret': 'str'} }
> +  'base': 'BlockdevOptionsCurlHttp',
> +  'data': { '*sslverify': 'bool'} }
>  
>  ##
>  # @BlockdevOptionsCurlFtp:

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