diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-12-01 15:25:19 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-12-22 22:25:35 +0300 |
| commit | ad24078e3fc4330647b5d0e0c95db7bec86136a5 (patch) | |
| tree | 008594068a8917881500a601612533389a7a936e /softmmu | |
| parent | a629fee99ba2189a7452a212f0a01696a65877ac (diff) | |
vl: Improve error message for conflicting -incoming and -loadvm
Currently, the conflict between -incoming and -loadvm is only detected
when loading the snapshot fails because the image is still inactive for
the incoming migration. This results in a suboptimal error message:
$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer
qemu-system-x86_64: Device 'ide0-hd0' is writable but does not support snapshots
Catch the situation already in qemu_validate_options() to improve the
message:
$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer
qemu-system-x86_64: 'incoming' and 'loadvm' options are mutually exclusive
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20231201142520.32255-3-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 5a7f21efaf99c60614fe1967be1c0f9aa46c526e)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index 5115221efe..ce88869618 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2321,6 +2321,10 @@ static void qemu_validate_options(const QDict *machine_opts) } } + if (loadvm && incoming) { + error_report("'incoming' and 'loadvm' options are mutually exclusive"); + exit(EXIT_FAILURE); + } if (loadvm && preconfig_requested) { error_report("'preconfig' and 'loadvm' options are " "mutually exclusive"); |