Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190313-pull-request' into...

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 4a350de5cd19a9ae0018774dd9af58f6c604c875..c1d5484e12e8acad6c2da987871b93dfbb3f0377 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -185,7 +185,6 @@ const char *prom_envs[MAX_PROM_ENVS];
 int boot_menu;
 bool boot_strict;
 uint8_t *boot_splash_filedata;
 int boot_menu;
 bool boot_strict;
 uint8_t *boot_splash_filedata;

-size_t boot_splash_filedata_size;

 bool wakeup_suspend_enabled;
 
 int icount_align_option;
 bool wakeup_suspend_enabled;
 
 int icount_align_option;


@@ -237,6 +236,7 @@ static struct {
     { .driver = "vmware-svga",          .flag = &default_vga       },
     { .driver = "qxl-vga",              .flag = &default_vga       },
     { .driver = "virtio-vga",           .flag = &default_vga       },
     { .driver = "vmware-svga",          .flag = &default_vga       },
     { .driver = "qxl-vga",              .flag = &default_vga       },
     { .driver = "virtio-vga",           .flag = &default_vga       },

+    { .driver = "ati-vga",              .flag = &default_vga       },

 };
 
 static QemuOptsList qemu_rtc_opts = {
 };
 
 static QemuOptsList qemu_rtc_opts = {


@@ -1190,6 +1190,55 @@ 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)
+{
+    /*
+     * If the currently selected machine wishes to override the
+     * units-per-bus property of its default HBA interface type, do so
+     * now.
+     */
+    if (machine_class->units_per_default_bus) {
+        override_max_devs(machine_class->block_default_type,
+                          machine_class->units_per_default_bus);
+    }
+
+    /* open the virtual block devices */
+    while (!QSIMPLEQ_EMPTY(bdo_queue)) {
+        BlockdevOptionsQueueEntry *bdo = QSIMPLEQ_FIRST(bdo_queue);
+
+        QSIMPLEQ_REMOVE_HEAD(bdo_queue, entry);
+        loc_push_restore(&bdo->loc);
+        qmp_blockdev_add(bdo->bdo, &error_fatal);
+        loc_pop(&bdo->loc);
+        qapi_free_BlockdevOptions(bdo->bdo);
+        g_free(bdo);
+    }
+    if (snapshot || replay_mode != REPLAY_MODE_NONE) {
+        qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
+                          NULL, NULL);
+    }
+    if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
+                          &machine_class->block_default_type, &error_fatal)) {
+        /* We printed help */
+        exit(0);
+    }
+
+    default_drive(default_cdrom, snapshot, machine_class->block_default_type, 2,
+                  CDROM_OPTS);
+    default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
+    default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
+
+}
+

 static QemuOptsList qemu_smp_opts = {
     .name = "smp-opts",
     .implied_opt_name = "cpus",
 static QemuOptsList qemu_smp_opts = {
     .name = "smp-opts",
     .implied_opt_name = "cpus",


@@ -2936,17 +2985,6 @@ static void user_register_global_props(void)
                       global_init_func, NULL, NULL);
 }
 
                       global_init_func, NULL, NULL);
 }
 

-/*
- * Note: we should see that these properties are actually having a
- * priority: accel < machine < user. This means e.g. when user
- * specifies something in "-global", it'll always be used with highest
- * priority than either machine/accelerator compat properties.
- */
-static void register_global_properties(MachineState *ms)
-{
-    user_register_global_props();
-}
-

 int main(int argc, char **argv, char **envp)
 {
     int i;
 int main(int argc, char **argv, char **envp)
 {
     int i;


@@ -2981,13 +3019,7 @@ int main(int argc, char **argv, char **envp)
     Error *err = NULL;
     bool list_data_dirs = false;
     char *dir, **dirs;
     Error *err = NULL;
     bool list_data_dirs = false;
     char *dir, **dirs;

-    typedef struct BlockdevOptions_queue {
-        BlockdevOptions *bdo;
-        Location loc;
-        QSIMPLEQ_ENTRY(BlockdevOptions_queue) entry;
-    } BlockdevOptions_queue;
-    QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue
-        = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
+    BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);

 
     module_call_init(MODULE_INIT_TRACE);
 
 
     module_call_init(MODULE_INIT_TRACE);
 


@@ -3111,12 +3143,12 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_blockdev:
                 {
                     Visitor *v;
             case QEMU_OPTION_blockdev:
                 {
                     Visitor *v;

-                    BlockdevOptions_queue *bdo;
+                    BlockdevOptionsQueueEntry *bdo;

 
                     v = qobject_input_visitor_new_str(optarg, "driver",
                                                       &error_fatal);
 
 
                     v = qobject_input_visitor_new_str(optarg, "driver",
                                                       &error_fatal);
 

-                    bdo = g_new(BlockdevOptions_queue, 1);
+                    bdo = g_new(BlockdevOptionsQueueEntry, 1);

                     visit_type_BlockdevOptions(v, NULL, &bdo->bdo,
                                                &error_fatal);
                     visit_free(v);
                     visit_type_BlockdevOptions(v, NULL, &bdo->bdo,
                                                &error_fatal);
                     visit_free(v);


@@ -3169,7 +3201,7 @@ int main(int argc, char **argv, char **envp)
 #ifdef CONFIG_CURSES
                 dpy.type = DISPLAY_TYPE_CURSES;
 #else
 #ifdef CONFIG_CURSES
                 dpy.type = DISPLAY_TYPE_CURSES;
 #else

-                error_report("curses support is disabled");
+                error_report("curses or iconv support is disabled");

                 exit(1);
 #endif
                 break;
                 exit(1);
 #endif
                 break;


@@ -3253,9 +3285,12 @@ int main(int argc, char **argv, char **envp)
                 add_device_config(DEV_BT, optarg);
                 break;
             case QEMU_OPTION_audio_help:
                 add_device_config(DEV_BT, optarg);
                 break;
             case QEMU_OPTION_audio_help:

-                AUD_help ();
+                audio_legacy_help();

                 exit (0);
                 break;
                 exit (0);
                 break;

+            case QEMU_OPTION_audiodev:
+                audio_parse_option(optarg);
+                break;

             case QEMU_OPTION_soundhw:
                 select_soundhw (optarg);
                 break;
             case QEMU_OPTION_soundhw:
                 select_soundhw (optarg);
                 break;


@@ -3941,6 +3976,8 @@ int main(int argc, char **argv, char **envp)
      */
     loc_set_none();
 
      */
     loc_set_none();
 

+    user_register_global_props();
+

     replay_configure(icount_opts);
 
     if (incoming && !preconfig_exit_requested) {
     replay_configure(icount_opts);
 
     if (incoming && !preconfig_exit_requested) {


@@ -3952,6 +3989,7 @@ int main(int argc, char **argv, char **envp)
     configure_rtc(qemu_find_opts_singleton("rtc"));
 
     machine_class = select_machine();
     configure_rtc(qemu_find_opts_singleton("rtc"));
 
     machine_class = select_machine();

+    object_set_machine_compat_props(machine_class->compat_props);

 
     set_memory_options(&ram_slots, &maxram_size, machine_class);
 
 
     set_memory_options(&ram_slots, &maxram_size, machine_class);
 


@@ -3996,6 +4034,10 @@ int main(int argc, char **argv, char **envp)
     }
     object_property_add_child(object_get_root(), "machine",
                               OBJECT(current_machine), &error_abort);
     }
     object_property_add_child(object_get_root(), "machine",
                               OBJECT(current_machine), &error_abort);

+    object_property_add_child(container_get(OBJECT(current_machine),
+                                            "/unattached"),
+                              "sysbus", OBJECT(sysbus_get_default()),
+                              NULL);

 
     if (machine_class->minimum_page_bits) {
         if (!set_preferred_target_page_bits(machine_class->minimum_page_bits)) {
 
     if (machine_class->minimum_page_bits) {
         if (!set_preferred_target_page_bits(machine_class->minimum_page_bits)) {


@@ -4234,6 +4276,13 @@ int main(int argc, char **argv, char **envp)
         exit(0);
     }
 
         exit(0);
     }
 

+    /*
+     * Note: we need to create block backends before
+     * machine_set_property(), so machine properties can refer to
+     * them.
+     */
+    configure_blockdev(&bdo_queue, machine_class, snapshot);
+

     machine_opts = qemu_get_machine_opts();
     qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
                      &error_fatal);
     machine_opts = qemu_get_machine_opts();
     qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
                      &error_fatal);


@@ -4248,12 +4297,6 @@ int main(int argc, char **argv, char **envp)
                      machine_class->name, machine_class->deprecation_reason);
     }
 
                      machine_class->name, machine_class->deprecation_reason);
     }
 

-    /*
-     * Register all the global properties, including accel properties,
-     * machine properties, and user-specified ones.
-     */
-    register_global_properties(current_machine);
-

     /*
      * Migration object can only be created after global properties
      * are applied correctly.
     /*
      * Migration object can only be created after global properties
      * are applied correctly.


@@ -4366,39 +4409,6 @@ int main(int argc, char **argv, char **envp)
     ram_mig_init();
     dirty_bitmap_mig_init();
 
     ram_mig_init();
     dirty_bitmap_mig_init();
 

-    /* If the currently selected machine wishes to override the units-per-bus
-     * property of its default HBA interface type, do so now. */
-    if (machine_class->units_per_default_bus) {
-        override_max_devs(machine_class->block_default_type,
-                          machine_class->units_per_default_bus);
-    }
-
-    /* open the virtual block devices */
-    while (!QSIMPLEQ_EMPTY(&bdo_queue)) {
-        BlockdevOptions_queue *bdo = QSIMPLEQ_FIRST(&bdo_queue);
-
-        QSIMPLEQ_REMOVE_HEAD(&bdo_queue, entry);
-        loc_push_restore(&bdo->loc);
-        qmp_blockdev_add(bdo->bdo, &error_fatal);
-        loc_pop(&bdo->loc);
-        qapi_free_BlockdevOptions(bdo->bdo);
-        g_free(bdo);
-    }
-    if (snapshot || replay_mode != REPLAY_MODE_NONE) {
-        qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
-                          NULL, NULL);
-    }
-    if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
-                          &machine_class->block_default_type, &error_fatal)) {
-        /* We printed help */
-        exit(0);
-    }
-
-    default_drive(default_cdrom, snapshot, machine_class->block_default_type, 2,
-                  CDROM_OPTS);
-    default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
-    default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
-

     qemu_opts_foreach(qemu_find_opts("mon"),
                       mon_init_func, NULL, &error_fatal);
 
     qemu_opts_foreach(qemu_find_opts("mon"),
                       mon_init_func, NULL, &error_fatal);
 


@@ -4447,6 +4457,8 @@ int main(int argc, char **argv, char **envp)
     /* do monitor/qmp handling at preconfig state if requested */
     main_loop();
 
     /* do monitor/qmp handling at preconfig state if requested */
     main_loop();
 

+    audio_init_audiodevs();
+

     /* from here on runstate is RUN_STATE_PRELAUNCH */
     machine_run_board_init(current_machine);
 
     /* from here on runstate is RUN_STATE_PRELAUNCH */
     machine_run_board_init(current_machine);