target-arm: Add support for AArch32 FP VRINTX

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 8d5d874e6853746be878923d8b650b70df93e3d2..c73462e8113b99ca0cdb20fa7d8c812fb25805ee 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -188,9 +188,7 @@ static int display_remote;
 const char* keyboard_layout = NULL;
 ram_addr_t ram_size;
 const char *mem_path = NULL;
 const char* keyboard_layout = NULL;
 ram_addr_t ram_size;
 const char *mem_path = NULL;

-#ifdef MAP_POPULATE

 int mem_prealloc = 0; /* force preallocation of physical target memory */
 int mem_prealloc = 0; /* force preallocation of physical target memory */

-#endif

 int nb_nics;
 NICInfo nd_table[MAX_NICS];
 int autostart;
 int nb_nics;
 NICInfo nd_table[MAX_NICS];
 int autostart;


@@ -232,7 +230,7 @@ int ctrl_grab = 0;
 unsigned int nb_prom_envs = 0;
 const char *prom_envs[MAX_PROM_ENVS];
 int boot_menu;
 unsigned int nb_prom_envs = 0;
 const char *prom_envs[MAX_PROM_ENVS];
 int boot_menu;

-bool boot_strict;
+static bool boot_strict;

 uint8_t *boot_splash_filedata;
 size_t boot_splash_filedata_size;
 uint8_t qemu_extra_params_fw[2];
 uint8_t *boot_splash_filedata;
 size_t boot_splash_filedata_size;
 uint8_t qemu_extra_params_fw[2];


@@ -428,6 +426,10 @@ static QemuOptsList qemu_machine_opts = {
             .name = "usb",
             .type = QEMU_OPT_BOOL,
             .help = "Set on/off to enable/disable usb",
             .name = "usb",
             .type = QEMU_OPT_BOOL,
             .help = "Set on/off to enable/disable usb",

+        },{
+            .name = "firmware",
+            .type = QEMU_OPT_STRING,
+            .help = "firmware image",

         },
         { /* End of list */ }
     },
         },
         { /* End of list */ }
     },


@@ -459,7 +461,7 @@ static QemuOptsList qemu_boot_opts = {
             .type = QEMU_OPT_STRING,
         }, {
             .name = "strict",
             .type = QEMU_OPT_STRING,
         }, {
             .name = "strict",

-            .type = QEMU_OPT_STRING,
+            .type = QEMU_OPT_BOOL,

         },
         { /*End of list */ }
     },
         },
         { /*End of list */ }
     },


@@ -543,7 +545,7 @@ QemuOpts *qemu_get_machine_opts(void)
     assert(list);
     opts = qemu_opts_find(list, NULL);
     if (!opts) {
     assert(list);
     opts = qemu_opts_find(list, NULL);
     if (!opts) {

-        opts = qemu_opts_create_nofail(list);
+        opts = qemu_opts_create(list, NULL, 0, &error_abort);

     }
     return opts;
 }
     }
     return opts;
 }


@@ -589,6 +591,7 @@ typedef struct {
 static const RunStateTransition runstate_transitions_def[] = {
     /*     from      ->     to      */
     { RUN_STATE_DEBUG, RUN_STATE_RUNNING },
 static const RunStateTransition runstate_transitions_def[] = {
     /*     from      ->     to      */
     { RUN_STATE_DEBUG, RUN_STATE_RUNNING },

+    { RUN_STATE_DEBUG, RUN_STATE_FINISH_MIGRATE },

 
     { RUN_STATE_INMIGRATE, RUN_STATE_RUNNING },
     { RUN_STATE_INMIGRATE, RUN_STATE_PAUSED },
 
     { RUN_STATE_INMIGRATE, RUN_STATE_RUNNING },
     { RUN_STATE_INMIGRATE, RUN_STATE_PAUSED },


@@ -2252,7 +2255,8 @@ static int balloon_parse(const char *arg)
                 return  -1;
         } else {
             /* create empty opts */
                 return  -1;
         } else {
             /* create empty opts */

-            opts = qemu_opts_create_nofail(qemu_find_opts("device"));
+            opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
+                                    &error_abort);

         }
         qemu_opt_set(opts, "driver", "virtio-balloon");
         return 0;
         }
         qemu_opt_set(opts, "driver", "virtio-balloon");
         return 0;


@@ -2512,14 +2516,14 @@ static int virtcon_parse(const char *devname)
         exit(1);
     }
 
         exit(1);
     }
 

-    bus_opts = qemu_opts_create_nofail(device);
+    bus_opts = qemu_opts_create(device, NULL, 0, &error_abort);

     if (arch_type == QEMU_ARCH_S390X) {
         qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
     } else {
         qemu_opt_set(bus_opts, "driver", "virtio-serial-pci");
     }
 
     if (arch_type == QEMU_ARCH_S390X) {
         qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
     } else {
         qemu_opt_set(bus_opts, "driver", "virtio-serial-pci");
     }
 

-    dev_opts = qemu_opts_create_nofail(device);
+    dev_opts = qemu_opts_create(device, NULL, 0, &error_abort);

     qemu_opt_set(dev_opts, "driver", "virtconsole");
 
     snprintf(label, sizeof(label), "virtcon%d", index);
     qemu_opt_set(dev_opts, "driver", "virtconsole");
 
     snprintf(label, sizeof(label), "virtcon%d", index);


@@ -2622,7 +2626,7 @@ static struct {
     { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed },
     { "xen", "Xen", xen_available, xen_init, &xen_allowed },
     { "kvm", "KVM", kvm_available, kvm_init, &kvm_allowed },
     { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed },
     { "xen", "Xen", xen_available, xen_init, &xen_allowed },
     { "kvm", "KVM", kvm_available, kvm_init, &kvm_allowed },

-    { "qtest", "QTest", qtest_available, qtest_init, &qtest_allowed },
+    { "qtest", "QTest", qtest_available, qtest_init_accel, &qtest_allowed },

 };
 
 static int configure_accelerator(void)
 };
 
 static int configure_accelerator(void)


@@ -2807,12 +2811,13 @@ static int object_create(QemuOpts *opts, void *opaque)
 
     obj = object_new(type);
     if (qemu_opt_foreach(opts, object_set_property, obj, 1) < 0) {
 
     obj = object_new(type);
     if (qemu_opt_foreach(opts, object_set_property, obj, 1) < 0) {

+        object_unref(obj);

         return -1;
     }
 
     object_property_add_child(container_get(object_get_root(), "/objects"),
                               id, obj, NULL);
         return -1;
     }
 
     object_property_add_child(container_get(object_get_root(), "/objects"),
                               id, obj, NULL);

-
+    object_unref(obj);

     return 0;
 }
 
     return 0;
 }
 


@@ -2834,6 +2839,8 @@ int main(int argc, char **argv, char **envp)
     QEMUMachine *machine;
     const char *cpu_model;
     const char *vga_model = "none";
     QEMUMachine *machine;
     const char *cpu_model;
     const char *vga_model = "none";

+    const char *qtest_chrdev = NULL;
+    const char *qtest_log = NULL;

     const char *pid_file = NULL;
     const char *incoming = NULL;
 #ifdef CONFIG_VNC
     const char *pid_file = NULL;
     const char *incoming = NULL;
 #ifdef CONFIG_VNC


@@ -2894,7 +2901,8 @@ int main(int argc, char **argv, char **envp)
     init_clocks();
     rtc_clock = QEMU_CLOCK_HOST;
 
     init_clocks();
     rtc_clock = QEMU_CLOCK_HOST;
 

-    qemu_cache_utils_init(envp);
+    qemu_init_auxval(envp);
+    qemu_cache_utils_init();

 
     QLIST_INIT (&vm_change_state_head);
     os_setup_early_signal_handling();
 
     QLIST_INIT (&vm_change_state_head);
     os_setup_early_signal_handling();


@@ -2917,7 +2925,7 @@ int main(int argc, char **argv, char **envp)
 
     bdrv_init_with_whitelist();
 
 
     bdrv_init_with_whitelist();
 

-    autostart= 1;
+    autostart = 1;

 
     /* first pass of option parsing */
     optind = 1;
 
     /* first pass of option parsing */
     optind = 1;


@@ -3206,11 +3214,9 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_mempath:
                 mem_path = optarg;
                 break;
             case QEMU_OPTION_mempath:
                 mem_path = optarg;
                 break;

-#ifdef MAP_POPULATE

             case QEMU_OPTION_mem_prealloc:
                 mem_prealloc = 1;
                 break;
             case QEMU_OPTION_mem_prealloc:
                 mem_prealloc = 1;
                 break;

-#endif

             case QEMU_OPTION_d:
                 log_mask = optarg;
                 break;
             case QEMU_OPTION_d:
                 log_mask = optarg;
                 break;


@@ -3229,7 +3235,7 @@ int main(int argc, char **argv, char **envp)
                 }
                 break;
             case QEMU_OPTION_bios:
                 }
                 break;
             case QEMU_OPTION_bios:

-                bios_name = optarg;
+                qemu_opts_set(qemu_find_opts("machine"), 0, "firmware", optarg);

                 break;
             case QEMU_OPTION_singlestep:
                 singlestep = 1;
                 break;
             case QEMU_OPTION_singlestep:
                 singlestep = 1;


@@ -3377,7 +3383,8 @@ int main(int argc, char **argv, char **envp)
 
                 qemu_opt_set_bool(fsdev, "readonly",
                                 qemu_opt_get_bool(opts, "readonly", 0));
 
                 qemu_opt_set_bool(fsdev, "readonly",
                                 qemu_opt_get_bool(opts, "readonly", 0));

-                device = qemu_opts_create_nofail(qemu_find_opts("device"));
+                device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
+                                          &error_abort);

                 qemu_opt_set(device, "driver", "virtio-9p-pci");
                 qemu_opt_set(device, "fsdev",
                              qemu_opt_get(opts, "mount_tag"));
                 qemu_opt_set(device, "driver", "virtio-9p-pci");
                 qemu_opt_set(device, "fsdev",
                              qemu_opt_get(opts, "mount_tag"));


@@ -3397,7 +3404,8 @@ int main(int argc, char **argv, char **envp)
                 }
                 qemu_opt_set(fsdev, "fsdriver", "synth");
 
                 }
                 qemu_opt_set(fsdev, "fsdriver", "synth");
 

-                device = qemu_opts_create_nofail(qemu_find_opts("device"));
+                device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
+                                          &error_abort);

                 qemu_opt_set(device, "driver", "virtio-9p-pci");
                 qemu_opt_set(device, "fsdev", "v_synth");
                 qemu_opt_set(device, "mount_tag", "v_synth");
                 qemu_opt_set(device, "driver", "virtio-9p-pci");
                 qemu_opt_set(device, "fsdev", "v_synth");
                 qemu_opt_set(device, "mount_tag", "v_synth");


@@ -3488,11 +3496,16 @@ int main(int argc, char **argv, char **envp)
             }
             case QEMU_OPTION_acpitable:
                 opts = qemu_opts_parse(qemu_find_opts("acpi"), optarg, 1);
             }
             case QEMU_OPTION_acpitable:
                 opts = qemu_opts_parse(qemu_find_opts("acpi"), optarg, 1);

-                g_assert(opts != NULL);
+                if (!opts) {
+                    exit(1);
+                }

                 do_acpitable_option(opts);
                 break;
             case QEMU_OPTION_smbios:
                 opts = qemu_opts_parse(qemu_find_opts("smbios"), optarg, 0);
                 do_acpitable_option(opts);
                 break;
             case QEMU_OPTION_smbios:
                 opts = qemu_opts_parse(qemu_find_opts("smbios"), optarg, 0);

+                if (!opts) {
+                    exit(1);
+                }

                 do_smbios_option(opts);
                 break;
             case QEMU_OPTION_enable_kvm:
                 do_smbios_option(opts);
                 break;
             case QEMU_OPTION_enable_kvm:


@@ -3866,8 +3879,10 @@ int main(int argc, char **argv, char **envp)
         qemu_set_log(mask);
     }
 
         qemu_set_log(mask);
     }
 

-    if (!trace_backend_init(trace_events, trace_file)) {
-        exit(1);
+    if (!is_daemonized()) {
+        if (!trace_backend_init(trace_events, trace_file)) {
+            exit(1);
+        }

     }
 
     /* If no data_dir is specified then try to find it relative to the
     }
 
     /* If no data_dir is specified then try to find it relative to the


@@ -4042,14 +4057,15 @@ int main(int argc, char **argv, char **envp)
 
     configure_accelerator();
 
 
     configure_accelerator();
 

-    if (!qtest_enabled() && qtest_chrdev) {
-        qtest_init();
+    if (qtest_chrdev) {
+        qtest_init(qtest_chrdev, qtest_log);

     }
 
     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");
     }
 
     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");

+    bios_name = qemu_opt_get(machine_opts, "firmware");

 
     boot_order = machine->default_boot_order;
     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
 
     boot_order = machine->default_boot_order;
     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);


@@ -4072,6 +4088,7 @@ int main(int argc, char **argv, char **envp)
         }
 
         boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu);
         }
 
         boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu);

+        boot_strict = qemu_opt_get_bool(opts, "strict", false);

     }
 
     if (!kernel_cmdline) {
     }
 
     if (!kernel_cmdline) {


@@ -4237,7 +4254,8 @@ int main(int argc, char **argv, char **envp)
 
     qdev_machine_init();
 
 
     qdev_machine_init();
 

-    QEMUMachineInitArgs args = { .ram_size = ram_size,
+    QEMUMachineInitArgs args = { .machine = machine,
+                                 .ram_size = ram_size,

                                  .boot_order = boot_order,
                                  .kernel_filename = kernel_filename,
                                  .kernel_cmdline = kernel_cmdline,
                                  .boot_order = boot_order,
                                  .kernel_filename = kernel_filename,
                                  .kernel_cmdline = kernel_cmdline,


@@ -4363,6 +4381,12 @@ int main(int argc, char **argv, char **envp)
 
     os_setup_post();
 
 
     os_setup_post();
 

+    if (is_daemonized()) {
+        if (!trace_backend_init(trace_events, trace_file)) {
+            exit(1);
+        }
+    }
+

     main_loop();
     bdrv_close_all();
     pause_all_vcpus();
     main_loop();
     bdrv_close_all();
     pause_all_vcpus();