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 <Jes.Sorensen@redhat.com>
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.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
qemu-img.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
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
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 <Jes.Sorensen@redhat.com> > 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 <berrange@redhat.com> > --- > qemu-img.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) FWIW: Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com> > 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
Am 04.07.2017 um 12:34 hat Daniel P. Berrange geschrieben: > 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 <Jes.Sorensen@redhat.com> > 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. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Thanks, applied to the block branch. Do you want to send another patch to do the same in qemu-img convert? Kevin
On Tue, Jul 04, 2017 at 02:16:06PM +0200, Kevin Wolf wrote: > Am 04.07.2017 um 12:34 hat Daniel P. Berrange geschrieben: > > 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 <Jes.Sorensen@redhat.com> > > 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. > > > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > > Thanks, applied to the block branch. > > Do you want to send another patch to do the same in qemu-img convert? Opps, I wasn't paying attention & missed the convert command. I'll just send a v2 of this that covers both. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2024 Red Hat, Inc.