motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qemu-img: allow qemu-img measure --object without a filename

Browse source 
In most qemu-img sub-commands the --object option only makes sense when
there is a filename.  qemu-img measure is an exception because objects
may be referenced from the image creation options instead of an existing
image file.  Allow --object without a filename.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200221112522.1497712-4-stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2020-02-21 11:25:21 +00:00 • committed by Max Reitz
parent a9da6e49d8
commit c3673dcf08
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qemu-img.c
View file

@ -4932,10 +4932,8 @@ static int img_measure(int argc, char **argv)
filename = argv[optind];
}
if (!filename &&
(object_opts || image_opts || fmt || snapshot_name || sn_opts)) {
error_report("--object, --image-opts, -f, and -l "
"require a filename argument.");
if (!filename && (image_opts || fmt || snapshot_name || sn_opts)) {
error_report("--image-opts, -f, and -l require a filename argument.");
goto out;
}
if (filename && img_size != UINT64_MAX) {