tests: Add iotest mirror-sparse for recent patches"
Signed-off-by: Michael Tokarev
---
v2: use `_supported_cache_modes none directsync` instead of _require_o_direct
as suggested by Philippe.
tests/qemu-iotests/tests/mirror-sparse | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/qe
On 05.08.2025 20:23, Philippe Mathieu-Daudé wrote:
diff --git a/tests/qemu-iotests/tests/mirror-sparse b/tests/qemu-
iotests/tests/mirror-sparse
index cfcaa600ab..19843a622c 100755
--- a/tests/qemu-iotests/tests/mirror-sparse
+++ b/tests/qemu-iotests/tests/mirror-sparse
@@ -41,6 +41,7 @@ _suppo
urs at the very beginning when we're checking for
sanity.
Fixes: c0ddcb2cbc146e "tests: Add iotest mirror-sparse for recent patches"
Signed-off-by: Michael Tokarev
---
tests/qemu-iotests/tests/mirror-sparse | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/qemu-iotests/tes
On 25.04.2025 03:52, Eric Blake wrote:
Prove that blockdev-mirror can now result in sparse raw destination
files, regardless of whether the source is raw or qcow2. By making
this a separate test, it was possible to test effects of individual
patches for the various pieces that all have to work t
On 15.07.2025 21:42, Kevin Wolf wrote:
Am 31.05.2025 um 19:15 hat Michael Tokarev geschrieben:
This is another iteration of this patch series, which tries
to add missing command-line options, --help output, make it
all more or less consistent, etc.
I addressed (hopefully) all comments so far
Add missing long options and --help output,
reorder options for consistency.
While at it, remove unused option_index variable.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 59 +++---
1 file changed, 38 insertions(+), 21 deletions(-)
diff
Add missing long options and --help output.
Reorder options for consistency.
Use -b for --backing, and recognize -B for backwards
compatibility. Unfortunately we can't use -B to
specify backing format.
Signed-off-by: Michael Tokarev
---
docs/tools/qemu-img.rst | 2 +-
qemu-
On 15.07.2025 16:07, Kevin Wolf wrote:
+" --start-offset OFFSET\n"
-s, --start-offset
+" --max-length LENGTH\n"
-l, --max-length
These are also undocumented. Lemme add some info for them..
/mjt
On 14.07.2025 11:01, Michael Tokarev wrote:
I'd very much love to add more commands/options to qemu-img *after*
my big patchset to it is either accepted or rejected. It's been in
the queue for over the years, and I have to rebase it painfully after
each change (thankfully there we
On 07.07.2025 23:58, Denis V. Lunev via wrote:
From time to time it is needed to remove all bitmaps from the image.
Before this patch the process is not very convinient. One should
perform
qemu-img info
and parse the output to obtain all names. After that one should
sequentially call
q
Ping once again?
Please let's move with this one. Either it should be accepted,
maybe with some tweaks, or dropped entirely. There's enough
silence already - it's been there for over 2 years.
Thanks,
/mjt
On 31.05.2025 20:15, Michael Tokarev wrote:
This is another iteratio
On 03.06.2025 15:59, Klaus Jensen wrote:
Two fixes for stable. See commits.
What do you mean "for stable"?
Are these not for master but for stable *only*?
Usually changes for qemu-stable are picked up *from*
master branch, unless there are major changes in
stable already.
Thanks,
/mjt
Use common code and simplify error message
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
Reviewed-by: Kevin Wolf
---
qemu-img.c | 63 --
1 file changed, 18 insertions(+), 45 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
onsistency.
Remove usage of missing_argument()/unrecognized_option() in
img_create().
Signed-off-by: Michael Tokarev
---
docs/tools/qemu-img.rst | 10 ++---
qemu-img.c | 84 +
2 files changed, 73 insertions(+), 21 deletions(-)
diff --git a/docs/
-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
docs/tools/qemu-img.rst | 2 +-
qemu-img.c | 52 ++---
2 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index 935f28bbc5
On 23.05.2025 21:24, John Snow wrote:
v3: rebased on top of python-qapi-linting (v4) pull request;
removed commits that are no longer needed.
Markus: I forget where we left off... shall we refresh?
v2: fix multi-return-sections bug :(
John Snow (4):
docs/qapi-domain: add return-nod
Add missing long options and --help output.
Reorder options for consistency.
Use -b for --backing, and recognize -B for backwards
compatibility. Unfortunately we can't use -B to
specify backing format.
Signed-off-by: Michael Tokarev
---
docs/tools/qemu-img.rst | 2 +-
qemu-
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 60 +++---
1 file changed, 44 insertions(+), 16 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 8fbf0c67a7
file
(was eg CACHE vs SRC_CACHE, which is unclear).
Probably should rename local variables.
Signed-off-by: Michael Tokarev
---
docs/tools/qemu-img.rst | 2 +-
qemu-img.c | 88 +
2 files changed, 64 insertions(+), 26 deletions(-)
diff --git a
is not handled right is when there's an option
between filename and size, and size is given as decrement, - in
this case -size will be treated as option, not as size.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 41 +++--
1 file changed, 27 insertions(
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 54 +++---
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 3dbfce527b
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 80 ++
1 file changed, 56 insertions(+), 24 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 5011ec5fce
For consistency with other commands, and since it already
accepts --image-opts, allow specifying -f fmt too.
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
docs/tools/qemu-img.rst | 2 +-
qemu-img-cmds.hx| 4 ++--
qemu-img.c | 9 ++---
3 files
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 50 --
1 file changed, 36 insertions(+), 14 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 97ce51a1c3
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 60 +-
1 file changed, 41 insertions(+), 19 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index a26498a4e8
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 68 ++
1 file changed, 48 insertions(+), 20 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index c8ce206b73
Add missing long options and --help output.
Also add -b short option for --backing-chain, and remove
now-unused OPTION_BACKING_CHAIN.
Reorder options for consistency.
While at it, remove unused option_index variable.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 54
Add long options, add help, reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 64 +++---
1 file changed, 46 insertions(+), 18 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index c24e1fb455..70573b79b5 100644
Add missing long options and --help output,
reorder options for consistency.
Add missing --object option.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 112 +++--
1 file changed, 84 insertions(+), 28 deletions(-)
diff --git a/qemu-img.c b/qemu
Add missing long options and --help output,
reorder options for consistency.
Also add -s short option for --size (and remove OPTION_SIZE).
Signed-off-by: Michael Tokarev
---
qemu-img.c | 89 +-
1 file changed, 62 insertions(+), 27 deletions
ve allowed size suffixes from the error message
as it makes no sense most of the time (should be in help instead).
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 111 +
tests/qemu-iotests/049.out | 9 +-
unrecognized_option() are now unused,
remove them.
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 210 ++---
1 file changed, 72 insertions(+), 138 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 44212de3f6..18f7ba07c9
Add missing long options and --help output,
reorder options for consistency.
While at it, remove unused option_index variable.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 57 ++
1 file changed, 36 insertions(+), 21 deletions(-)
diff
Use the same function to parse --object as used by all
other qemu-img subcommands.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 16 ++--
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 5e651e8089..c24e1fb455 100644
--- a/qemu-img.c
Add missing long options and --help output,
reorder options for consistency.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 52
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index f655c301af
This info will be used to generate --help output.
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
Reviewed-by: Kevin Wolf
---
qemu-img.c | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index
sequent changes command by command, with main() done
last.
unrecognized_option() and missing_argument() functions
prototypes aren't changed by this patch, since they're
called from many places and will be removed a few patches
later. Only
Initializing an unsigned as -1, or using temporary
sval for conversion is awkward. Since we don't allow
other "negative" values anyway, use signed value and
pass it to bdrv_img_create() (where it is properly
converted to unsigned), simplifying code.
Signed-off-by: Michael Tokar
t to the common
(before-subcomman) place, document it there, and remove the
--object mentions from individual commands --help output.
Thanks,
/mjt
Michael Tokarev (27):
qemu-img: measure: convert img_size to signed, simplify handling
qemu-img: create: convert img_size to signed, simplify handl
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 2129158c13..c8ce206b73 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -864,8 +864,9 @@ static int img_check(const
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
Reviewed-by: Daniel P. Berrangé
Reviewed-by:
On 13.05.2025 18:54, Kevin Wolf wrote:
Am 27.09.2024 um 08:11 hat Michael Tokarev geschrieben:
Add missing long options and --help output.
...
+" --image-opts\n"
+" indicates that FILENAME is a complete image specification\n"
+" instead of a file name (inco
On 13.05.2025 18:54, Kevin Wolf wrote:
Am 27.09.2024 um 08:11 hat Michael Tokarev geschrieben:
+cmd_help(ccmd,
+"[-f FMT | --image-opts] [-T CACHE_MODE] [-r] [-u]\n"
+"[--output human|json] [--object OBJDEF] FILENAME\n"
+,
+" -q, --quiet\n&q
On 14.05.2025 12:28, Michael Tokarev wrote:
On 13.05.2025 18:06, Kevin Wolf wrote:
Am 28.04.2025 um 15:58 hat Michael Tokarev geschrieben:
28.04.2025 16:54, Michael Tokarev пишет:
25.04.2025 20:52, Kevin Wolf wrote:
From: Denis Rastyogin
This error was discovered by fuzzing qemu-img
On 13.05.2025 18:06, Kevin Wolf wrote:
Am 28.04.2025 um 15:58 hat Michael Tokarev geschrieben:
28.04.2025 16:54, Michael Tokarev пишет:
25.04.2025 20:52, Kevin Wolf wrote:
From: Denis Rastyogin
This error was discovered by fuzzing qemu-img.
Currently, running `qemu-img bench -d 0` in
On 13.05.2025 14:42, Kevin Wolf wrote:
Am 12.05.2025 um 11:23 hat Michael Tokarev geschrieben:
[..]
This was already merged for 10.0 as commit 61b6d9b7.
Heck. Yes, it is, and I already queued it for 9.2, too.
Sorry for the noise.
/mjt
On 26.03.2025 12:26, zoudongjie via wrote:
From: Zhu Yangyang
Calling qmp_block_set_io_throttle() will be blocked for a long time
when a network disk is configured and the network failure is just about
to occur.
This series add a timeout parameter for qmp_block_set_io_throttle to control
its e
On 07.04.2025 18:59, Kevin Wolf wrote:
Originally, all failed SG_IO requests called scsi_handle_rw_error() to
apply the configured error policy. However, commit f3126d65, which was
supposed to be a mere refactoring for scsi-disk.c, broke this and
accidentally completed the SCSI request without co
28.04.2025 16:54, Michael Tokarev пишет:
25.04.2025 20:52, Kevin Wolf wrote:
From: Denis Rastyogin
This error was discovered by fuzzing qemu-img.
Currently, running `qemu-img bench -d 0` in img_bench is allowed,
which is a pointless operation and causes qemu-img to hang.
Signed-off-by
25.04.2025 20:52, Kevin Wolf wrote:
From: Denis Rastyogin
This error was discovered by fuzzing qemu-img.
Currently, running `qemu-img bench -d 0` in img_bench is allowed,
which is a pointless operation and causes qemu-img to hang.
Signed-off-by: Denis Rastyogin
Message-ID: <20250327162423.25
10.04.2025 16:14, Kevin Wolf wrote:
Am 10.04.2025 um 14:37 hat Michael Tokarev geschrieben:
...>> Does it make sense to apply this one for older stable qemu series?
In particular, in 8.2, we lack cfe0880835cd3
"scsi-disk: Use positive return value for status in dma_readv/writev&qu
07.04.2025 18:59, Kevin Wolf пишет:
Originally, all failed SG_IO requests called scsi_handle_rw_error() to
apply the configured error policy. However, commit f3126d65, which was
supposed to be a mere refactoring for scsi-disk.c, broke this and
accidentally completed the SCSI request without consi
19.01.2025 12:15, Michael Tokarev wrote:
create_long_filename() intentionally uses direntry_t->name[8+3] array
as a larger array. This works, but makes statid code analysis tools
unhappy. The problem here is that a directory entry holding long file
name is significantly different from regu
17.01.2025 11:52, Thomas Huth wrote:
On 16/01/2025 00.22, Philippe Mathieu-Daudé wrote:
We removed the implementations in commit 46a2bd52571
("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
but forgot to remove the declarations. Do it now.
Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecat
22.01.2025 15:19, BALATON Zoltan wrote:
On Wed, 22 Jan 2025, Michael Tokarev wrote:
22.01.2025 02:14, Pierrick Bouvier wrote:
..
I agree the existing code (and this patch) is pretty cryptic for anyone not
familiar with FAT format.
However, I think it could be a good thing to first merge this
22.01.2025 02:14, Pierrick Bouvier wrote:
..
I agree the existing code (and this patch) is pretty cryptic for anyone not
familiar with FAT format.
However, I think it could be a good thing to first merge this one (which is correct, and works), and refactor this in a second time, so the current
20.01.2025 23:17, Fahrzin Hemmati wrote:
My apologies, I saw the Signed-off-by requirement at first, but as I followed the docs I got to "git publish" and didn't realize "git publish" was
actually able to send emails on my system (I don't remember setting up any SMTP settings). By that time, I fo
add comments explaining what is going on (since long file names are really
weird),
rewrite the second loop to do one UTF16 char at a time instead of byte,
and fix coding style.
Signed-off-by: Michael Tokarev
---
block/vvfat.c | 54 +--
1 file
nto several parts within the entry, not just in regular
8+3 name field.
Treat the entry as array of bytes instead. This fixes the OOB access
from the compiler/tools PoV, but does not change the resulting code
in any way.
Keep the existing code style.
Signed-off-by: Michael Tokarev
---
bl
ys. A directory
entry for a long FAT file name is significantly different from
a directory entry for a regular FAT file name.
This change makes whole logic dealing with the long filenames
a bit more clear (hopefully).
Based on ideas by Volker Rümelin.
Signed-off-by: Michael Tokarev
---
block/vvfat.c
ys. A directory
entry for a long FAT file name is significantly different from
a directory entry for a regular FAT file name.
This change makes whole logic dealing with the long filenames
a bit more clear (hopefully).
Based on ideas by Volker Rümelin.
Signed-off-by: Michael Tokarev
---
block/vvfat.c
19.01.2025 00:26, Michael Tokarev wrote:
+static unsigned write_lfn_part(uint8_t *dest, unsigned dsize,
+ const gunichar2 *lptr, const gunichar2 *lend)
+{
+unsigned i = 0;
+for (; i < dsize / 2 && lptr + i <= lend; ++i) { /* incl. t
18.01.2025 23:54, BALATON Zoltan wrote:
+typedef struct lfn_direntry_t {
+ uint8_t sequence;
+ uint8_t name01[10];
+ uint8_t attributes;
+ uint8_t direntry_type;
+ uint8_t sfn_checksum;
+ uint8_t name0e[12];
+ uint16_t begin;
+ uint8_t name1c[4];
+} QEMU_PACKED lfn_dirent
18.01.2025 23:32, Volker Rümelin wrote:
The rules are:
If the file name length in characters is a multiple of 13 you are done.
Otherwise the remaining unused LFN direntry name array elements have to
be filled with one 0x (a 16 bit 0) and the rest with 0x.
BTW, are we really okay with a
18.01.2025 23:32, Volker Rümelin wrote:
+static unsigned write_lfn_part(uint8_t *dest, unsigned dsize,
+ const gunichar2 *lptr, const gunichar2 *lend)
+{
+unsigned i;
+for(i = 0; i < dsize / 2 && lptr + i < lend; ++i) {
+dest[i / 2 + 0] = lptr[i] & 0
ys. A directory
entry for a long FAT file name is significantly different from
a directory entry for a regular FAT file name.
This change makes whole logic dealing with the long filenames
a bit more clear (hopefully).
Based on ideas by Volker Rümelin.
Signed-off-by: Michael Tokarev
---
block/vvfat.c
05.01.2025 16:59, Volker Rümelin wrote:
In function create_long_filname(), the array name[8 + 3] in
struct direntry_t is used as if it were defined as name[32].
This is intentional and works. It's nevertheless an out of
bounds array access. To avoid this problem, this patch adds a
struct lfn_dire
17.01.2025 02:39, Bernhard Beschow wrote:
Am 15. Januar 2025 12:55:29 UTC schrieb Michael Tokarev :
Is this a qemu-stable material?
Good question. Given that this part of the code has some further issues [1] I'd
rather not alter stable behavior because we might just trade one bu
13.01.2025 00:00, Phil Dennis-Jordan wrote:
This patch set introduces a new ARM and macOS HVF specific machine type
called "vmapple". There are also some patches for fixing XHCI spec
compliance issues and adding a workaround to a quirk in the macOS guest's
XHCI driver.
The vmapple machine type a
11.01.2025 21:36, Bernhard Beschow wrote:
In U-Boot, the fsl_esdhc[_imx] driver waits for both "transmit completed" and
"DMA" bits in esdhc_send_cmd_common() by means of DATA_COMPLETE constant. QEMU
currently misses to set the DMA bit which causes the driver to loop forever. Fix
that by setting t
04.12.2024 22:51, Pierrick Bouvier wrote:
Found with test sbsaref introduced in [1].
..
Applied to the trivial-patches tree. Thank you!
/mjt
01.08.2024 00:25, Philippe Mathieu-Daudé wrote:
Since malicious guest can write invalid addresses to
the ADMASYSADDR register, we need to check whether the
descriptor could be correctly filled or not.
Ping? This has been about the 9.1 release, now 9.2 is out already
and we're working on 10.0..
13.11.2024 15:55, Richard W.M. Jones wrote:
From: Jakub Jelen
The libssh does not handle non-blocking mode in SFTP correctly. The
driver code already changes the mode to blocking for the SFTP
initialization, but for some reason changes to non-blocking mode.
This used to work accidentally until
Heh. I was creating a qemu bug report on gitlab when this email arrived :)
13.11.2024 14:49, Richard W.M. Jones wrote:
From: Jakub Jelen
The libssh does not handle non-blocking mode in SFTP correctly. The
driver code already changes the mode to blocking for the SFTP
initialization, but for som
28.10.2024 19:23, Jan Luebbe wrote:
The sd_bootpart_offset() function calculates the *runtime* offset which
changes as the guest switches between accessing the main user data area
and the boot partitions by writing to the EXT_CSD_PART_CONFIG_ACC_MASK
bits, so it shouldn't be used to calculate the
29.08.2024 21:55, Kevin Wolf wrote:
s->offset and s->size are only set at the end of the function and still
contain the old values when formatting the error message. Print the
parameters with the new values that we actually checked instead.
Fixes: 500e2434207d ('raw-format: Split raw_read_option
Ping #5?
Thanks,
/mjt
27.09.2024 09:10, Michael Tokarev wrote:
This is a re-send of this patchset from Apr-24, after multiple pings.
I rebased it on top of current qemu/master, though nothing has really
changed - it is still the same changes. We should either apply it or
drop it if it is not
On 13.02.2024 16:03, Philippe Mathieu-Daudé wrote:
We should not wire IRQs on unrealized device.
Signed-off-by: Philippe Mathieu-Daudé
Reviewed-by: Peter Maydell
Reviewed-by: Yoshinori Sato
---
hw/sh4/r2d.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/sh4/r2d.c b/
30.09.2024 11:43, Vladimir Sementsov-Ogievskiy wrote:
From: Fiona Ebner
Allow overlapping request by removing the assert that made it
impossible. There are only two callers:
1. block_copy_task_create()
It already asserts the very same condition before calling
reqlist_init_req().
2. cbw_snaps
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 40
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index fff537df26..7c20a5772d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
Add missing long options and --help output.
convert uses -B for --backing, - why not -b?
Signed-off-by: Michael Tokarev
---
qemu-img.c | 90 --
1 file changed, 81 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index
Signed-off-by: Michael Tokarev
---
qemu-img.c | 45 +
1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 7a111bce72..ea66bfa195 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1488,25 +1488,52 @@ static int
is not handled right is when there's an option
between filename and size, and size is given as decrement, - in
this case -size will be treated as option, not as size.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 41 +++--
1 file changed, 27 insertions(
also add short description to each command and use it in --help
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 40 ++--
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 39dfaa5144
Add missing long options and --help output.
Also add -s short option for --size (and remove OPTION_SIZE).
Signed-off-by: Michael Tokarev
---
qemu-img.c | 53 -
1 file changed, 40 insertions(+), 13 deletions(-)
diff --git a/qemu-img.c b/qemu
Create helper function cmd_help() to display command-specific
help text, and use it to print --help for 'create' subcommand.
Add missing long options (eg --format) in img_create().
Remove usage of missing_argument()/unrecognized_option() in
img_create().
Signed-off-by: Micha
ve allowed size suffixes from the error message
as it makes no sense most of the time (should be in help instead).
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 111 +
tests/qemu-iotests/049.out | 9 +-
-off-by: Michael Tokarev
---
qemu-img.c | 55 +-
1 file changed, 46 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 62f9ce4069..47dfa137c1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3793,26 +3793,61 @@ static int
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 39 +--
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 7c20a5772d..b3e521bc09 100644
--- a/qemu-img.c
+++ b/qemu-img.c
changes command by command, with main() done
last.
unrecognized_option() and missing_argument() functions
prototypes aren't changed by this patch, since they're
called from many places and will be removed a few patches
later. Only artifical "qemu-img" argv0 is provided in
there for
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 34 ++
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 688c01722c..76000c485c 100644
--- a/qemu-img.c
+++ b/qemu-img.c
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 45 -
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 967f6343de..62f9ce4069 100644
--- a/qemu-img.c
+++ b/qemu
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 38 +-
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index da10fafffc..688c01722c 100644
--- a/qemu-img.c
+++ b/qemu-img.c
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 44
1 file changed, 36 insertions(+), 8 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 9157a6b45d..7a111bce72 100644
--- a/qemu-img.c
+++ b/qemu
Add missing long options and --help output.
Signed-off-by: Michael Tokarev
---
qemu-img.c | 64 +-
1 file changed, 54 insertions(+), 10 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 76000c485c..fff537df26 100644
--- a/qemu-img.c
-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
docs/tools/qemu-img.rst | 2 +-
qemu-img.c | 52 ++---
2 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index 9b628c4da5
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 1bd88fcf63..9157a6b45d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -859,8 +859,9 @@ static int img_check(const
unrecognized_option() are now unused,
remove them.
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 172 -
1 file changed, 39 insertions(+), 133 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 3721cf070b..39dfaa5144
Use common code and simplify error message
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
qemu-img.c | 63 --
1 file changed, 18 insertions(+), 45 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 7ed5e6d1a8
For consistency with other commands, and since it already
accepts --image-opts, allow specifying -f fmt too.
Signed-off-by: Michael Tokarev
Reviewed-by: Daniel P. Berrangé
---
docs/tools/qemu-img.rst | 2 +-
qemu-img-cmds.hx| 4 ++--
qemu-img.c | 9 ++---
3 files
1 - 100 of 345 matches
Mail list logo
