Am 07.02.2024 um 18:58 hat Michael Tokarev geschrieben: > This is an incomplete first attempt only, there's a lot left to do. > > All the options in qemu-img is a complete mess, - no, inconsistent or > incomplete syntax in documentation, many undocumented options, option > names are used inconsistently and differently for different commands, > no long options exists for many short options, --help output is a huge > mess by its own, and the way how it all is generated is another story. > docs/tools/qemu-img.rst with qemu-img-opts.hx is yet another. > > I hoped to fix just an option or two, but it ended up in a large task, > and I need some help and discussion, hence the RFC. > > The idea is: > > - create more or less consistent set of options between different > subcommands > - provide long options which can be used without figuring out which > -T/-t, -f|-F|-O etc to use for which of the two images given > - have qemu-img --help provide just a list of subcommands > - have qemu-img COMMAND --help to describe just this subcommand
The help desperately needs some cleanup like this, so thank you for doing something about it. > - get rid of qemu-img-opts.hx, instead finish documentation in > qemu-img.rst based on the actual options implemented in > qemu-img.c. You mean qemu-img-cmds.hx? The one advantage it has is that it makes it obvious if there is a mismatch in the options we show in the help output and in the documentation. But I'm not overly concerned either way. I would probably have left it alone just because leaving it is less work than changing it and the result isn't very different. > I started converting subcommands one by one, providing long options > and --help output. And immediately faced some questions which needs > wider discussion. > > o We have --image-opts and --target-image-opts. Do we really need both? > In my view, --image-opts should be sort of global, turning *all* > filenames on this command line into complete image specifications, > there's no need to have separate image-opts and --target-image-opts. > Don't know what to do wrt compatibility though. It shouldn't be made > this way from the beginning. As a possible solution, introduce a new > option and deprecate current set. I think it's better not to touch things like this. qemu-img is much more likely to be used directly by human users (and their small scripts) than QEMU itself, so we need to be even more careful with deprecating things. In fact, I'm not even sure if combining them would make it easier to use. Often, it's only source _or_ target that have a complicated setup that requires blockdev-type descriptions. As a human user, I prefer if I can still just use the file name for the other image instead of getting the full -blockdev verbosity there, too. > o For conversion (convert, dd, etc), we've source and destination, > so it's easy to distinguish using long options, like --source-format > --target-cache etc (-t/-T -f/-F is a mess here already). What to > do with compare? --format1 --format2 is ugly, maybe --a-format and > --b-format? Maybe we can get off with --source (a) and --target (b) > instead of filename1 & filename2? > (--cache in this context is global for both). For those commands where there is a source and a target, --source-format and --target-format have a clear advantage, they are easy to remember and hard to confuse. For compare, as you saw, there is no clear naming. 1/2 or a/b don't make the command any clearer than -f/-F. So maybe just don't add long versions there? > o qemu-img convert. It's the most messy one, and it is not really > documented (nor in qemu-img.rst , eg there's nothing in there about > FILENAME2, -B is difficult to understand, etc). > At the very least, I'd say the options should be > --source-format, --source-cache etc > --target-format, --target-options These seem obvious. (Actually, --target-options vs. just --options isn't completely obvious - after all, there are fundamentally no create options for source.) --source-* are also a bit weird because 'qemu-img convert' takes multiple source images and then it applies the same format to all of them. But that's more about how it works, so not a problem with the option _name_. > --target-image-opts - this shold go IMHO This one less so. Even generally speaking, changing interfaces incompatibly comes with a cost that is probably too big to justify it just for interfaces that look a bit nicer, but don't provide any new functionality. And as I said above, I don't agree that image-opts should be global. > o check and commit - inconsistent cache flags? > In convert, cache is backwards (source/target)? It's a bit messy because the cache mode options -T/-t work the opposite way of -f/-F. But I think the commands are consistent with each other? -T was added as a source cache parameter to all of the subcommands at the same time, in commit 40055951a. > At first, I tried to have more or less common option descriptions, > using various parameters, variables or #defines, but in different > commands the same options has slightly different wording, and in > some option names are different, so it looks like it's best to > have complete text in each subcommand. Yeah, let's not make this more complicated than it has to be. Kevin