fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qemu-img: measure: convert img_size to signed, simplify handling

Browse source 
qemu_opt_set_number() expects signed int64_t.

Use int64_t instead of uint64_t for img_size, use -1 as "unset"
value instead of UINT64_MAX, and do not require temporary sval
for conversion from string.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20250531171609.197078-2-mjt@tls.msk.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Michael Tokarev 2025-05-31 20:15:43 +03:00 • committed by Kevin Wolf
parent 96acc034ff
commit 1c47abc577
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
qemu-img.c
View file

@ -5370,7 +5370,7 @@ static int img_measure(int argc, char **argv)
QemuOpts *sn_opts = NULL;
QemuOptsList *create_opts = NULL;
bool image_opts = false;
uint64_t img_size = UINT64_MAX;
int64_t img_size = -1;
BlockMeasureInfo *info = NULL;
Error *local_err = NULL;
int ret = 1;
@ -5428,16 +5428,11 @@ static int img_measure(int argc, char **argv)
}
break;
case OPTION_SIZE:
{
int64_t sval;
sval = cvtnum("image size", optarg);
if (sval < 0) {
img_size = cvtnum("image size", optarg);
if (img_size < 0) {
goto out;
}
img_size = (uint64_t)sval;
}
break;
break;
}
}
@ -5452,11 +5447,11 @@ static int img_measure(int argc, char **argv)
error_report("--image-opts, -f, and -l require a filename argument.");
goto out;
}
if (filename && img_size != UINT64_MAX) {
if (filename && img_size != -1) {
error_report("--size N cannot be used together with a filename.");
goto out;
}
if (!filename && img_size == UINT64_MAX) {
if (!filename && img_size == -1) {
error_report("Either --size N or one filename must be specified.");
goto out;
}
@ -5504,7 +5499,7 @@ static int img_measure(int argc, char **argv)
goto out;
}
}
if (img_size != UINT64_MAX) {
if (img_size != -1) {
qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);
}