| Message ID | 20201027182144.3315885-10-pbonzini@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cleanup qemu_init and make sense of command line processing | expand |
On Tue, 27 Oct 2020 14:21:24 -0400 Paolo Bonzini <pbonzini@redhat.com> wrote: > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/core/machine.c | 1 + > softmmu/vl.c | 78 +++++++++++++++++++++++------------------------ > 2 files changed, 40 insertions(+), 39 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d84b84463c..f5e559c493 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -878,6 +878,7 @@ static void machine_initfn(Object *obj) > ms->dump_guest_core = true; > ms->mem_merge = true; > ms->enable_graphics = true; > + ms->kernel_cmdline = g_strdup(""); > > if (mc->nvdimm_supported) { > Object *obj = OBJECT(ms); > diff --git a/softmmu/vl.c b/softmmu/vl.c > index f9bae50c27..3316c5534c 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -123,6 +123,7 @@ static int data_dir_idx; > static const char *mem_path; > static const char *boot_order; > static const char *boot_once; > +static const char *incoming; > enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; > int display_opengl; > const char* keyboard_layout = NULL; > @@ -2870,6 +2871,39 @@ static char *find_datadir(void) > return get_relocated_path(CONFIG_QEMU_DATADIR); > } > > +static void qemu_validate_options(void) > +{ > + QemuOpts *machine_opts = qemu_get_machine_opts(); > + const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); > + const char *initrd_filename = qemu_opt_get(machine_opts, "initrd"); > + const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); > + > + if (kernel_filename == NULL) { > + if (kernel_cmdline != NULL) { > + error_report("-append only allowed with -kernel option"); > + exit(1); > + } > + > + if (initrd_filename != NULL) { > + error_report("-initrd only allowed with -kernel option"); > + exit(1); > + } > + } > + > + if (incoming && !preconfig_exit_requested) { > + error_report("'preconfig' and 'incoming' options are " > + "mutually exclusive"); > + exit(EXIT_FAILURE); > + } > + > +#ifdef CONFIG_CURSES > + if (is_daemonized() && dpy.type == DISPLAY_TYPE_CURSES) { > + error_report("curses display cannot be used with -daemonize"); > + exit(1); > + } > +#endif > +} > + > static void qemu_process_early_options(void) > { > char **dirs; > @@ -3136,9 +3170,6 @@ void qemu_init(int argc, char **argv, char **envp) > { > int i; > int snapshot = 0; > - int linux_boot; > - const char *initrd_filename; > - const char *kernel_filename, *kernel_cmdline; > QemuOpts *opts, *machine_opts; > QemuOpts *icount_opts = NULL, *accel_opts = NULL; > QemuOptsList *olist; > @@ -3147,7 +3178,6 @@ void qemu_init(int argc, char **argv, char **envp) > const char *loadvm = NULL; > MachineClass *machine_class; > const char *vga_model = NULL; > - const char *incoming = NULL; > bool userconfig = true; > bool nographic = false; > int display_remote = 0; > @@ -4068,6 +4098,8 @@ void qemu_init(int argc, char **argv, char **envp) > */ > loc_set_none(); > > + qemu_validate_options(); > + > /* These options affect everything else and should be processed > * before daemonizing. > */ > @@ -4082,12 +4114,6 @@ void qemu_init(int argc, char **argv, char **envp) > user_register_global_props(); > replay_configure(icount_opts); > > - if (incoming && !preconfig_exit_requested) { > - error_report("'preconfig' and 'incoming' options are " > - "mutually exclusive"); > - exit(EXIT_FAILURE); > - } > - > configure_rtc(qemu_find_opts_singleton("rtc")); > > machine_class = select_machine(); > @@ -4191,12 +4217,6 @@ void qemu_init(int argc, char **argv, char **envp) > error_report("-nographic cannot be used with -daemonize"); > exit(1); > } > -#ifdef CONFIG_CURSES > - if (dpy.type == DISPLAY_TYPE_CURSES) { > - error_report("curses display cannot be used with -daemonize"); > - exit(1); > - } > -#endif > } > > if (nographic) { > @@ -4327,11 +4347,6 @@ void qemu_init(int argc, char **argv, char **envp) > qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); > } > > - machine_opts = qemu_get_machine_opts(); > - kernel_filename = qemu_opt_get(machine_opts, "kernel"); > - initrd_filename = qemu_opt_get(machine_opts, "initrd"); > - kernel_cmdline = qemu_opt_get(machine_opts, "append"); > - > opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); > if (opts) { > boot_order = qemu_opt_get(opts, "order"); > @@ -4352,24 +4367,9 @@ void qemu_init(int argc, char **argv, char **envp) > boot_order = machine_class->default_boot_order; > } > > - if (!kernel_cmdline) { > - kernel_cmdline = ""; > - current_machine->kernel_cmdline = (char *)kernel_cmdline; > - } > - > - linux_boot = (kernel_filename != NULL); > - > - if (!linux_boot && *kernel_cmdline != '\0') { > - error_report("-append only allowed with -kernel option"); > - exit(1); > - } > - > - if (!linux_boot && initrd_filename != NULL) { > - error_report("-initrd only allowed with -kernel option"); > - exit(1); > - } > - > - if (semihosting_enabled() && !semihosting_get_argc() && kernel_filename) { > + if (semihosting_enabled() && !semihosting_get_argc()) { > + const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); > + const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); > /* fall back to the -kernel/-append */ > semihosting_arg_fallback(kernel_filename, kernel_cmdline); > }
diff --git a/hw/core/machine.c b/hw/core/machine.c index d84b84463c..f5e559c493 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -878,6 +878,7 @@ static void machine_initfn(Object *obj) ms->dump_guest_core = true; ms->mem_merge = true; ms->enable_graphics = true; + ms->kernel_cmdline = g_strdup(""); if (mc->nvdimm_supported) { Object *obj = OBJECT(ms); diff --git a/softmmu/vl.c b/softmmu/vl.c index f9bae50c27..3316c5534c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -123,6 +123,7 @@ static int data_dir_idx; static const char *mem_path; static const char *boot_order; static const char *boot_once; +static const char *incoming; enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; int display_opengl; const char* keyboard_layout = NULL; @@ -2870,6 +2871,39 @@ static char *find_datadir(void) return get_relocated_path(CONFIG_QEMU_DATADIR); } +static void qemu_validate_options(void) +{ + QemuOpts *machine_opts = qemu_get_machine_opts(); + const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); + const char *initrd_filename = qemu_opt_get(machine_opts, "initrd"); + const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); + + if (kernel_filename == NULL) { + if (kernel_cmdline != NULL) { + error_report("-append only allowed with -kernel option"); + exit(1); + } + + if (initrd_filename != NULL) { + error_report("-initrd only allowed with -kernel option"); + exit(1); + } + } + + if (incoming && !preconfig_exit_requested) { + error_report("'preconfig' and 'incoming' options are " + "mutually exclusive"); + exit(EXIT_FAILURE); + } + +#ifdef CONFIG_CURSES + if (is_daemonized() && dpy.type == DISPLAY_TYPE_CURSES) { + error_report("curses display cannot be used with -daemonize"); + exit(1); + } +#endif +} + static void qemu_process_early_options(void) { char **dirs; @@ -3136,9 +3170,6 @@ void qemu_init(int argc, char **argv, char **envp) { int i; int snapshot = 0; - int linux_boot; - const char *initrd_filename; - const char *kernel_filename, *kernel_cmdline; QemuOpts *opts, *machine_opts; QemuOpts *icount_opts = NULL, *accel_opts = NULL; QemuOptsList *olist; @@ -3147,7 +3178,6 @@ void qemu_init(int argc, char **argv, char **envp) const char *loadvm = NULL; MachineClass *machine_class; const char *vga_model = NULL; - const char *incoming = NULL; bool userconfig = true; bool nographic = false; int display_remote = 0; @@ -4068,6 +4098,8 @@ void qemu_init(int argc, char **argv, char **envp) */ loc_set_none(); + qemu_validate_options(); + /* These options affect everything else and should be processed * before daemonizing. */ @@ -4082,12 +4114,6 @@ void qemu_init(int argc, char **argv, char **envp) user_register_global_props(); replay_configure(icount_opts); - if (incoming && !preconfig_exit_requested) { - error_report("'preconfig' and 'incoming' options are " - "mutually exclusive"); - exit(EXIT_FAILURE); - } - configure_rtc(qemu_find_opts_singleton("rtc")); machine_class = select_machine(); @@ -4191,12 +4217,6 @@ void qemu_init(int argc, char **argv, char **envp) error_report("-nographic cannot be used with -daemonize"); exit(1); } -#ifdef CONFIG_CURSES - if (dpy.type == DISPLAY_TYPE_CURSES) { - error_report("curses display cannot be used with -daemonize"); - exit(1); - } -#endif } if (nographic) { @@ -4327,11 +4347,6 @@ void qemu_init(int argc, char **argv, char **envp) qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); } - machine_opts = qemu_get_machine_opts(); - kernel_filename = qemu_opt_get(machine_opts, "kernel"); - initrd_filename = qemu_opt_get(machine_opts, "initrd"); - kernel_cmdline = qemu_opt_get(machine_opts, "append"); - opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); if (opts) { boot_order = qemu_opt_get(opts, "order"); @@ -4352,24 +4367,9 @@ void qemu_init(int argc, char **argv, char **envp) boot_order = machine_class->default_boot_order; } - if (!kernel_cmdline) { - kernel_cmdline = ""; - current_machine->kernel_cmdline = (char *)kernel_cmdline; - } - - linux_boot = (kernel_filename != NULL); - - if (!linux_boot && *kernel_cmdline != '\0') { - error_report("-append only allowed with -kernel option"); - exit(1); - } - - if (!linux_boot && initrd_filename != NULL) { - error_report("-initrd only allowed with -kernel option"); - exit(1); - } - - if (semihosting_enabled() && !semihosting_get_argc() && kernel_filename) { + if (semihosting_enabled() && !semihosting_get_argc()) { + const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); + const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); /* fall back to the -kernel/-append */ semihosting_arg_fallback(kernel_filename, kernel_cmdline); }
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/core/machine.c | 1 + softmmu/vl.c | 78 +++++++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 39 deletions(-)