[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/36] vl: preconfig and loadvm are mutually exclusive
From: |
Paolo Bonzini |
Subject: |
[PATCH 08/36] vl: preconfig and loadvm are mutually exclusive |
Date: |
Mon, 23 Nov 2020 09:14:07 -0500 |
Just like -incoming. Later we will add support for "-incoming defer
-preconfig", because there are cases (Xen, block layer) that want
to look at RUNSTATE_INMIGRATE. -loadvm will remain mutually exclusive
with preconfig; the plan is to just do loadvm in the monitor, since
the user is already going to interact with it for preconfiguration.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/vl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 6699c23a16..acea4286e9 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -124,6 +124,7 @@ static const char *mem_path;
static const char *boot_order;
static const char *boot_once;
static const char *incoming;
+static const char *loadvm;
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
int display_opengl;
const char* keyboard_layout = NULL;
@@ -2890,6 +2891,11 @@ static void qemu_validate_options(void)
}
}
+ if (loadvm && !preconfig_exit_requested) {
+ error_report("'preconfig' and 'loadvm' options are "
+ "mutually exclusive");
+ exit(EXIT_FAILURE);
+ }
if (incoming && !preconfig_exit_requested) {
error_report("'preconfig' and 'incoming' options are "
"mutually exclusive");
@@ -3172,7 +3178,6 @@ void qemu_init(int argc, char **argv, char **envp)
QemuOptsList *olist;
int optind;
const char *optarg;
- const char *loadvm = NULL;
MachineClass *machine_class;
const char *vga_model = NULL;
bool userconfig = true;
--
2.26.2
- [PATCH 10/36] qemu-option: restrict qemu_opts_set to merge-lists QemuOpts, (continued)
- [PATCH 10/36] qemu-option: restrict qemu_opts_set to merge-lists QemuOpts, Paolo Bonzini, 2020/11/23
- [PATCH 14/36] vl: extract default devices to separate functions, Paolo Bonzini, 2020/11/23
- [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Paolo Bonzini, 2020/11/23
- Re: [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Igor Mammedov, 2020/11/26
- Re: [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Paolo Bonzini, 2020/11/27
- Re: [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Igor Mammedov, 2020/11/27
- Re: [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Paolo Bonzini, 2020/11/27
- Re: [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Igor Mammedov, 2020/11/27
- Re: [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Paolo Bonzini, 2020/11/27
[PATCH 08/36] vl: preconfig and loadvm are mutually exclusive,
Paolo Bonzini <=
[PATCH 17/36] vl: separate qemu_create_late_backends, Paolo Bonzini, 2020/11/23
[PATCH 22/36] vl: move -global check earlier, Paolo Bonzini, 2020/11/23
[PATCH 18/36] vl: separate qemu_create_machine, Paolo Bonzini, 2020/11/23
[PATCH 25/36] hmp: introduce cmd_available, Paolo Bonzini, 2020/11/23
[PATCH 16/36] vl: separate qemu_create_early_backends, Paolo Bonzini, 2020/11/23
[PATCH 23/36] migration, vl: start migration via qmp_migrate_incoming, Paolo Bonzini, 2020/11/23
[PATCH 20/36] vl: separate qemu_resolve_machine_memdev, Paolo Bonzini, 2020/11/23