Re: [Qemu-devel] [PATCH] qemu-img: delete the -e and -6 options from the 'create' command

[Kashyap Chamarthy]

On Tue, Jul 04, 2017 at 11:34:27AM +0100, Daniel P. Berrange wrote:
> The '-e' and '-6' options to the 'create' command were "deprecated"
> in favour of the more generic '-o' option many years ago:
> 
>   commit eec77d9e712bd4157a4e1c0b5a9249d168add738
>   Author: Jes Sorensen <address@hidden>
>   Date:   Tue Dec 7 17:44:34 2010 +0100
> 
>     qemu-img: Deprecate obsolete -6 and -e options
> 
> Except this was never actually a deprecation, which would imply giving
> the user a warning while the functionality continues to work for a
> number of releases before eventual removal. Instead the options were
> immediately turned into an error + exit. Given that the functionality
> is already broken, there's no point in keeping these psuedo-deprecation
> messages around any longer.

Sounds and looks good.

> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
>  qemu-img.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)

FWIW:

Reviewed-by: Kashyap Chamarthy <address@hidden>

> diff --git a/qemu-img.c b/qemu-img.c
> index 91ad6be..a65239f 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -464,7 +464,7 @@ static int img_create(int argc, char **argv)
>              {"object", required_argument, 0, OPTION_OBJECT},
>              {0, 0, 0, 0}
>          };
> -        c = getopt_long(argc, argv, ":F:b:f:he6o:q",
> +        c = getopt_long(argc, argv, ":F:b:f:ho:q",
>                          long_options, NULL);
>          if (c == -1) {
>              break;
> @@ -488,14 +488,6 @@ static int img_create(int argc, char **argv)
>          case 'f':
>              fmt = optarg;
>              break;
> -        case 'e':
> -            error_report("option -e is deprecated, please use \'-o "
> -                  "encryption\' instead!");
> -            goto fail;
> -        case '6':
> -            error_report("option -6 is deprecated, please use \'-o "
> -                  "compat6\' instead!");
> -            goto fail;
>          case 'o':
>              if (!is_valid_option_list(optarg)) {
>                  error_report("Invalid option list: %s", optarg);
> -- 
> 2.9.4
> 
> 

-- 
/kashyap