diff mbox series

[22/36] vl: move -global check earlier

Message ID 20201123141435.2726558-23-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series cleanup qemu_init and make sense of command line processing | expand

Commit Message

Paolo Bonzini Nov. 23, 2020, 2:14 p.m. UTC
The check has the same effect here, it only matters that it is performed
once all devices, both builtin and user-specified, have been created.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 softmmu/vl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Igor Mammedov Nov. 26, 2020, 5:55 p.m. UTC | #1
On Mon, 23 Nov 2020 09:14:21 -0500
Paolo Bonzini <pbonzini@redhat.com> wrote:

> The check has the same effect here, it only matters that it is performed
> once all devices, both builtin and user-specified, have been created.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  softmmu/vl.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index 073d7412ad..ccc3b8e838 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -3483,6 +3483,8 @@ static void qemu_machine_creation_done(void)
>          net_check_clients();
>      }
>  
> +    qdev_prop_check_globals();
> +
>      if (boot_once) {
>          qemu_boot_set(boot_once, &error_fatal);
>          qemu_register_reset(restore_boot_order, g_strdup(boot_order));
> @@ -4540,7 +4542,6 @@ void qemu_init(int argc, char **argv, char **envp)
>          replay_vmstate_init();
>      }
>  
> -    qdev_prop_check_globals();
>      if (vmstate_dump_file) {
>          /* dump and exit */
>          dump_vmstate_json_to_file(vmstate_dump_file);
diff mbox series

Patch

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 073d7412ad..ccc3b8e838 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3483,6 +3483,8 @@  static void qemu_machine_creation_done(void)
         net_check_clients();
     }
 
+    qdev_prop_check_globals();
+
     if (boot_once) {
         qemu_boot_set(boot_once, &error_fatal);
         qemu_register_reset(restore_boot_order, g_strdup(boot_order));
@@ -4540,7 +4542,6 @@  void qemu_init(int argc, char **argv, char **envp)
         replay_vmstate_init();
     }
 
-    qdev_prop_check_globals();
     if (vmstate_dump_file) {
         /* dump and exit */
         dump_vmstate_json_to_file(vmstate_dump_file);