[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/29] vl: preconfig and loadvm are mutually exclusive
From: |
Paolo Bonzini |
Subject: |
[PATCH 10/29] vl: preconfig and loadvm are mutually exclusive |
Date: |
Tue, 27 Oct 2020 14:21:25 -0400 |
Just like -incoming.
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 3316c5534c..c2a5ee61f9 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");
@@ -3175,7 +3181,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
- [RFC PATCH v2 00/37] cleanup qemu_init and make sense of command line processing, Paolo Bonzini, 2020/10/27
- [PATCH 05/29] vl: split various early command line options to a separate function, Paolo Bonzini, 2020/10/27
- [PATCH 04/29] vl: remove bogus check, Paolo Bonzini, 2020/10/27
- [PATCH 06/29] vl: move various initialization routines out of qemu_init, Paolo Bonzini, 2020/10/27
- [PATCH 02/29] semihosting: fix order of initialization functions, Paolo Bonzini, 2020/10/27
- [PATCH 07/29] vl: extract qemu_init_subsystems, Paolo Bonzini, 2020/10/27
- [PATCH 10/29] vl: preconfig and loadvm are mutually exclusive,
Paolo Bonzini <=
- [PATCH 13/29] vl: load plugins as late as possible, Paolo Bonzini, 2020/10/27
- [PATCH 03/29] vl: extract validation of -smp to machine.c, Paolo Bonzini, 2020/10/27
- [PATCH 09/29] vl: extract various command line validation snippets to a new function, Paolo Bonzini, 2020/10/27
- [PATCH 11/29] vl: extract various command line desugaring snippets to a new function, Paolo Bonzini, 2020/10/27
- [PATCH 01/29] trace: remove argument from trace_init_file, Paolo Bonzini, 2020/10/27
- [PATCH 08/29] vl: move prelaunch part of qemu_init to new functions, Paolo Bonzini, 2020/10/27
- [PATCH 15/29] vl: extract default devices to separate functions, Paolo Bonzini, 2020/10/27
- [PATCH 23/29] vl: move -global check earlier, Paolo Bonzini, 2020/10/27
- [PATCH 16/29] vl: move CHECKPOINT_INIT after preconfig, Paolo Bonzini, 2020/10/27