From: Igor Mammedov <imammedo@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH 17/29] vl: separate qemu_create_early_backends
Date: Wed, 18 Nov 2020 17:29:07 +0100 [thread overview]
Message-ID: <20201118172907.268ce760@redhat.com> (raw)
In-Reply-To: <20201027182144.3315885-18-pbonzini@redhat.com>
On Tue, 27 Oct 2020 14:21:32 -0400
Paolo Bonzini <pbonzini@redhat.com> wrote:
> "Early" backends are created before the machine and can be used as
> machine options.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> softmmu/vl.c | 123 +++++++++++++++++++++++++++------------------------
> 1 file changed, 65 insertions(+), 58 deletions(-)
>
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index ebe3d46889..109036c089 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -117,6 +117,14 @@
>
> #define MAX_VIRTIO_CONSOLES 1
>
> +typedef struct BlockdevOptionsQueueEntry {
> + BlockdevOptions *bdo;
> + Location loc;
> + QSIMPLEQ_ENTRY(BlockdevOptionsQueueEntry) entry;
> +} BlockdevOptionsQueueEntry;
> +
> +typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) BlockdevOptionsQueue;
> +
> static const char *cpu_option;
> static const char *data_dir[16];
> static int data_dir_idx;
> @@ -126,7 +134,9 @@ static const char *boot_once;
> static const char *incoming;
> static const char *loadvm;
> static int display_remote;
> +static int snapshot;
> static QemuPluginList plugin_list = QTAILQ_HEAD_INITIALIZER(plugin_list);
> +static BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
> static bool nographic = false;
> enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
> int mem_prealloc; /* force preallocation of physical target memory */
> @@ -1043,14 +1053,6 @@ static void default_drive(int enable, int snapshot, BlockInterfaceType type,
>
> }
>
> -typedef struct BlockdevOptionsQueueEntry {
> - BlockdevOptions *bdo;
> - Location loc;
> - QSIMPLEQ_ENTRY(BlockdevOptionsQueueEntry) entry;
> -} BlockdevOptionsQueueEntry;
> -
> -typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) BlockdevOptionsQueue;
> -
> static void configure_blockdev(BlockdevOptionsQueue *bdo_queue,
> MachineClass *machine_class, int snapshot)
> {
> @@ -2640,7 +2642,7 @@ static int machine_set_property(void *opaque,
> * cannot be created here, as it depends on the chardev
> * already existing.
> */
> -static bool object_create_initial(const char *type, QemuOpts *opts)
> +static bool object_create_early(const char *type, QemuOpts *opts)
> {
> if (user_creatable_print_help(type, opts)) {
> exit(0);
> @@ -2696,6 +2698,58 @@ static bool object_create_initial(const char *type, QemuOpts *opts)
> return true;
> }
>
> +static void qemu_create_early_backends(void)
> +{
> + MachineClass *machine_class = MACHINE_GET_CLASS(current_machine);
> +
> + if ((alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) {
> + error_report("-alt-grab and -ctrl-grab are only valid "
> + "for SDL, ignoring option");
> + }
> + if (dpy.has_window_close &&
> + (dpy.type != DISPLAY_TYPE_GTK && dpy.type != DISPLAY_TYPE_SDL)) {
> + error_report("-no-quit is only valid for GTK and SDL, "
> + "ignoring option");
> + }
> +
> + qemu_display_early_init(&dpy);
> + qemu_console_early_init();
> +
> + if (dpy.has_gl && dpy.gl != DISPLAYGL_MODE_OFF && display_opengl == 0) {
> +#if defined(CONFIG_OPENGL)
> + error_report("OpenGL is not supported by the display");
> +#else
> + error_report("OpenGL support is disabled");
> +#endif
> + exit(1);
> + }
> +
> + qemu_opts_foreach(qemu_find_opts("object"),
> + user_creatable_add_opts_foreach,
> + object_create_early, &error_fatal);
> +
> + /* spice needs the timers to be initialized by this point */
> + /* spice must initialize before audio as it changes the default auiodev */
> + /* spice must initialize before chardevs (for spicevmc and spiceport) */
> + qemu_spice.init();
> +
> + qemu_opts_foreach(qemu_find_opts("chardev"),
> + chardev_init_func, NULL, &error_fatal);
> +
> +#ifdef CONFIG_VIRTFS
> + qemu_opts_foreach(qemu_find_opts("fsdev"),
> + fsdev_init_func, NULL, &error_fatal);
> +#endif
> +
> + /*
> + * Note: we need to create audio and block backends before
> + * machine_set_property(), so machine properties can refer to
> + * them.
> + */
> + configure_blockdev(&bdo_queue, machine_class, snapshot);
> + audio_init_audiodevs();
> +}
> +
>
> /*
> * The remainder of object creation happens after the
> @@ -2703,7 +2757,7 @@ static bool object_create_initial(const char *type, QemuOpts *opts)
> */
> static bool object_create_delayed(const char *type, QemuOpts *opts)
> {
> - return !object_create_initial(type, opts);
> + return !object_create_early(type, opts);
> }
>
>
> @@ -3321,7 +3375,6 @@ static void qemu_machine_creation_done(void)
>
> void qemu_init(int argc, char **argv, char **envp)
> {
> - int snapshot = 0;
> QemuOpts *opts, *machine_opts;
> QemuOpts *icount_opts = NULL, *accel_opts = NULL;
> QemuOptsList *olist;
> @@ -3334,7 +3387,6 @@ void qemu_init(int argc, char **argv, char **envp)
> FILE *vmstate_dump_file = NULL;
> Error *err = NULL;
> bool have_custom_ram_size;
> - BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
>
> qemu_add_opts(&qemu_drive_opts);
> qemu_add_drive_opts(&qemu_legacy_drive_opts);
> @@ -4308,52 +4360,7 @@ void qemu_init(int argc, char **argv, char **envp)
>
> qemu_disable_default_devices();
> qemu_create_default_devices();
> - if ((alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) {
> - error_report("-alt-grab and -ctrl-grab are only valid "
> - "for SDL, ignoring option");
> - }
> - if (dpy.has_window_close &&
> - (dpy.type != DISPLAY_TYPE_GTK && dpy.type != DISPLAY_TYPE_SDL)) {
> - error_report("-no-quit is only valid for GTK and SDL, "
> - "ignoring option");
> - }
> -
> - qemu_display_early_init(&dpy);
> - qemu_console_early_init();
> -
> - if (dpy.has_gl && dpy.gl != DISPLAYGL_MODE_OFF && display_opengl == 0) {
> -#if defined(CONFIG_OPENGL)
> - error_report("OpenGL is not supported by the display");
> -#else
> - error_report("OpenGL support is disabled");
> -#endif
> - exit(1);
> - }
> -
> - qemu_opts_foreach(qemu_find_opts("object"),
> - user_creatable_add_opts_foreach,
> - object_create_initial, &error_fatal);
> -
> - /* spice needs the timers to be initialized by this point */
> - /* spice must initialize before audio as it changes the default auiodev */
> - /* spice must initialize before chardevs (for spicevmc and spiceport) */
> - qemu_spice.init();
> -
> - qemu_opts_foreach(qemu_find_opts("chardev"),
> - chardev_init_func, NULL, &error_fatal);
> -
> -#ifdef CONFIG_VIRTFS
> - qemu_opts_foreach(qemu_find_opts("fsdev"),
> - fsdev_init_func, NULL, &error_fatal);
> -#endif
> -
> - /*
> - * Note: we need to create audio and block backends before
> - * machine_set_property(), so machine properties can refer to
> - * them.
> - */
> - configure_blockdev(&bdo_queue, machine_class, snapshot);
> - audio_init_audiodevs();
> + qemu_create_early_backends();
>
> machine_opts = qemu_get_machine_opts();
> qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
next prev parent reply other threads:[~2020-11-18 16:32 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 18:21 [RFC PATCH v2 00/37] cleanup qemu_init and make sense of command line processing Paolo Bonzini
2020-10-27 18:21 ` [PATCH 01/29] trace: remove argument from trace_init_file Paolo Bonzini
2020-10-27 18:21 ` [PATCH 02/29] semihosting: fix order of initialization functions Paolo Bonzini
2020-10-27 18:21 ` [PATCH 03/29] vl: extract validation of -smp to machine.c Paolo Bonzini
2020-10-28 16:32 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 04/29] vl: remove bogus check Paolo Bonzini
2020-10-28 16:48 ` Igor Mammedov
2020-10-28 16:55 ` Daniel P. Berrangé
2020-10-28 19:32 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 05/29] vl: split various early command line options to a separate function Paolo Bonzini
2020-11-02 15:30 ` Igor Mammedov
2020-11-02 16:33 ` Paolo Bonzini
2020-10-27 18:21 ` [PATCH 06/29] vl: move various initialization routines out of qemu_init Paolo Bonzini
2020-11-02 15:40 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 07/29] vl: extract qemu_init_subsystems Paolo Bonzini
2020-11-02 15:55 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 08/29] vl: move prelaunch part of qemu_init to new functions Paolo Bonzini
2020-11-11 19:29 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 09/29] vl: extract various command line validation snippets to a new function Paolo Bonzini
2020-11-11 19:39 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 10/29] vl: preconfig and loadvm are mutually exclusive Paolo Bonzini
2020-11-11 19:58 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 11/29] vl: extract various command line desugaring snippets to a new function Paolo Bonzini
2020-11-11 19:57 ` Igor Mammedov
2020-11-11 20:04 ` Paolo Bonzini
2020-11-18 16:55 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 12/29] vl: create "-net nic -net user" default earlier Paolo Bonzini
2020-11-18 14:43 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 13/29] vl: load plugins as late as possible Paolo Bonzini
2020-10-27 18:21 ` [PATCH 14/29] vl: move semihosting command line fallback to qemu_finish_machine_init Paolo Bonzini
2020-10-27 18:21 ` [PATCH 15/29] vl: extract default devices to separate functions Paolo Bonzini
2020-10-27 18:21 ` [PATCH 16/29] vl: move CHECKPOINT_INIT after preconfig Paolo Bonzini
2020-10-27 18:21 ` [PATCH 17/29] vl: separate qemu_create_early_backends Paolo Bonzini
2020-11-18 16:29 ` Igor Mammedov [this message]
2020-10-27 18:21 ` [PATCH 18/29] vl: separate qemu_create_late_backends Paolo Bonzini
2020-11-18 16:33 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 19/29] vl: separate qemu_create_machine Paolo Bonzini
2020-11-18 16:45 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 20/29] vl: separate qemu_apply_machine_options Paolo Bonzini
2020-11-18 16:57 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 21/29] vl: separate qemu_resolve_machine_memdev Paolo Bonzini
2020-11-20 13:15 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 22/29] vl: initialize displays before preconfig loop Paolo Bonzini
2020-11-20 15:11 ` Igor Mammedov
2020-11-20 15:53 ` Paolo Bonzini
2020-11-20 16:32 ` Igor Mammedov
2020-11-20 16:46 ` Paolo Bonzini
2020-11-20 17:11 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 23/29] vl: move -global check earlier Paolo Bonzini
2020-11-20 15:10 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 24/29] migration, vl: start migration via qmp_migrate_incoming Paolo Bonzini
2020-11-20 15:34 ` Igor Mammedov
2020-11-20 16:02 ` Paolo Bonzini
2020-12-02 13:10 ` Dr. David Alan Gilbert
2020-12-02 13:15 ` Daniel P. Berrangé
2020-12-02 13:29 ` Paolo Bonzini
2020-12-02 13:36 ` Paolo Bonzini
2020-12-02 15:08 ` Dr. David Alan Gilbert
2020-10-27 18:21 ` [PATCH 25/29] vl: start VM via qmp_cont Paolo Bonzini
2020-11-20 16:08 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 26/29] hmp: introduce cmd_available Paolo Bonzini
2020-11-20 15:46 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 27/29] remove preconfig state Paolo Bonzini
2020-11-20 16:01 ` Igor Mammedov
2020-11-20 16:22 ` Paolo Bonzini
2020-10-27 18:21 ` [PATCH 28/29] vl: remove separate preconfig main_loop Paolo Bonzini
2020-11-20 16:26 ` Igor Mammedov
2020-11-20 16:39 ` Paolo Bonzini
2020-11-23 8:34 ` Paolo Bonzini
2020-10-27 18:21 ` [PATCH 29/29] vl: allow -incoming defer with -preconfig Paolo Bonzini
2020-11-20 16:28 ` Igor Mammedov
2020-11-20 16:45 ` Paolo Bonzini
2020-11-02 15:57 ` [RFC PATCH v2 00/37] cleanup qemu_init and make sense of command line processing Igor Mammedov
2020-11-02 16:34 ` Paolo Bonzini
2020-11-03 12:57 ` Igor Mammedov
2020-11-03 14:37 ` Paolo Bonzini
2020-11-20 16:19 ` Igor Mammedov
2020-11-20 16:27 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201118172907.268ce760@redhat.com \
--to=imammedo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).