ARM: arm_cpu_reset: make it possible to use high vectors for reset_exc

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 1c283c9fcea8870302acbcddff2432383bc8e8b8..7511e7036c1f3a932b5510d599d5e9ba93a63ff8 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -188,15 +188,13 @@ 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;
 static int rtc_utc = 1;
 static int rtc_date_offset = -1; /* -1 means no change */
 int nb_nics;
 NICInfo nd_table[MAX_NICS];
 int autostart;
 static int rtc_utc = 1;
 static int rtc_date_offset = -1; /* -1 means no change */

-QEMUClock *rtc_clock;
+QEMUClockType rtc_clock;

 int vga_interface_type = VGA_NONE;
 static int full_screen = 0;
 static int no_frame = 0;
 int vga_interface_type = VGA_NONE;
 static int full_screen = 0;
 static int no_frame = 0;


@@ -254,6 +252,7 @@ uint64_t node_mem[MAX_NODES];
 unsigned long *node_cpumask[MAX_NODES];
 
 uint8_t qemu_uuid[16];
 unsigned long *node_cpumask[MAX_NODES];
 
 uint8_t qemu_uuid[16];

+bool qemu_uuid_set;

 
 static QEMUBootSetHandler *boot_set_handler;
 static void *boot_set_opaque;
 
 static QEMUBootSetHandler *boot_set_handler;
 static void *boot_set_opaque;


@@ -427,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 */ }
     },


@@ -637,9 +640,8 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
     { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
     { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
 

-    { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED },
+    { RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING },

     { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },
     { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },

-    { RUN_STATE_GUEST_PANICKED, RUN_STATE_DEBUG },

 
     { RUN_STATE_MAX, RUN_STATE_MAX },
 };
 
     { RUN_STATE_MAX, RUN_STATE_MAX },
 };


@@ -685,8 +687,7 @@ int runstate_is_running(void)
 bool runstate_needs_reset(void)
 {
     return runstate_check(RUN_STATE_INTERNAL_ERROR) ||
 bool runstate_needs_reset(void)
 {
     return runstate_check(RUN_STATE_INTERNAL_ERROR) ||

-        runstate_check(RUN_STATE_SHUTDOWN) ||
-        runstate_check(RUN_STATE_GUEST_PANICKED);
+        runstate_check(RUN_STATE_SHUTDOWN);

 }
 
 StatusInfo *qmp_query_status(Error **errp)
 }
 
 StatusInfo *qmp_query_status(Error **errp)


@@ -805,11 +806,11 @@ static void configure_rtc(QemuOpts *opts)
     value = qemu_opt_get(opts, "clock");
     if (value) {
         if (!strcmp(value, "host")) {
     value = qemu_opt_get(opts, "clock");
     if (value) {
         if (!strcmp(value, "host")) {

-            rtc_clock = host_clock;
+            rtc_clock = QEMU_CLOCK_HOST;

         } else if (!strcmp(value, "rt")) {
         } else if (!strcmp(value, "rt")) {

-            rtc_clock = rt_clock;
+            rtc_clock = QEMU_CLOCK_REALTIME;

         } else if (!strcmp(value, "vm")) {
         } else if (!strcmp(value, "vm")) {

-            rtc_clock = vm_clock;
+            rtc_clock = QEMU_CLOCK_VIRTUAL;

         } else {
             fprintf(stderr, "qemu: invalid option value '%s'\n", value);
             exit(1);
         } else {
             fprintf(stderr, "qemu: invalid option value '%s'\n", value);
             exit(1);


@@ -843,45 +844,6 @@ static int nb_hcis;
 static int cur_hci;
 static struct HCIInfo *hci_table[MAX_NICS];
 
 static int cur_hci;
 static struct HCIInfo *hci_table[MAX_NICS];
 

-static struct bt_vlan_s {
-    struct bt_scatternet_s net;
-    int id;
-    struct bt_vlan_s *next;
-} *first_bt_vlan;
-
-/* find or alloc a new bluetooth "VLAN" */
-static struct bt_scatternet_s *qemu_find_bt_vlan(int id)
-{
-    struct bt_vlan_s **pvlan, *vlan;
-    for (vlan = first_bt_vlan; vlan != NULL; vlan = vlan->next) {
-        if (vlan->id == id)
-            return &vlan->net;
-    }
-    vlan = g_malloc0(sizeof(struct bt_vlan_s));
-    vlan->id = id;
-    pvlan = &first_bt_vlan;
-    while (*pvlan != NULL)
-        pvlan = &(*pvlan)->next;
-    *pvlan = vlan;
-    return &vlan->net;
-}
-
-static void null_hci_send(struct HCIInfo *hci, const uint8_t *data, int len)
-{
-}
-
-static int null_hci_addr_set(struct HCIInfo *hci, const uint8_t *bd_addr)
-{
-    return -ENOTSUP;
-}
-
-static struct HCIInfo null_hci = {
-    .cmd_send = null_hci_send,
-    .sco_send = null_hci_send,
-    .acl_send = null_hci_send,
-    .bdaddr_set = null_hci_addr_set,
-};
-

 struct HCIInfo *qemu_next_hci(void)
 {
     if (cur_hci == nb_hcis)
 struct HCIInfo *qemu_next_hci(void)
 {
     if (cur_hci == nb_hcis)


@@ -890,36 +852,6 @@ struct HCIInfo *qemu_next_hci(void)
     return hci_table[cur_hci++];
 }
 
     return hci_table[cur_hci++];
 }
 

-static struct HCIInfo *hci_init(const char *str)
-{
-    char *endp;
-    struct bt_scatternet_s *vlan = 0;
-
-    if (!strcmp(str, "null"))
-        /* null */
-        return &null_hci;
-    else if (!strncmp(str, "host", 4) && (str[4] == '\0' || str[4] == ':'))
-        /* host[:hciN] */
-        return bt_host_hci(str[4] ? str + 5 : "hci0");
-    else if (!strncmp(str, "hci", 3)) {
-        /* hci[,vlan=n] */
-        if (str[3]) {
-            if (!strncmp(str + 3, ",vlan=", 6)) {
-                vlan = qemu_find_bt_vlan(strtol(str + 9, &endp, 0));
-                if (*endp)
-                    vlan = 0;
-            }
-        } else
-            vlan = qemu_find_bt_vlan(0);
-        if (vlan)
-           return bt_new_hci(vlan);
-    }
-
-    fprintf(stderr, "qemu: Unknown bluetooth HCI `%s'.\n", str);
-
-    return 0;
-}
-

 static int bt_hci_parse(const char *str)
 {
     struct HCIInfo *hci;
 static int bt_hci_parse(const char *str)
 {
     struct HCIInfo *hci;


@@ -1526,8 +1458,10 @@ static void configure_msg(QemuOpts *opts)
 
 static int usb_device_add(const char *devname)
 {
 
 static int usb_device_add(const char *devname)
 {

-    const char *p;

     USBDevice *dev = NULL;
     USBDevice *dev = NULL;

+#ifndef CONFIG_LINUX
+    const char *p;
+#endif

 
     if (!usb_enabled(false)) {
         return -1;
 
     if (!usb_enabled(false)) {
         return -1;


@@ -1543,15 +1477,8 @@ static int usb_device_add(const char *devname)
     /* only the linux version is qdev-ified, usb-bsd still needs this */
     if (strstart(devname, "host:", &p)) {
         dev = usb_host_device_open(usb_bus_find(-1), p);
     /* only the linux version is qdev-ified, usb-bsd still needs this */
     if (strstart(devname, "host:", &p)) {
         dev = usb_host_device_open(usb_bus_find(-1), p);

-    } else
-#endif
-    if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
-        dev = usb_bt_init(usb_bus_find(-1),
-                          devname[2] ? hci_init(p)
-                                     : bt_new_hci(qemu_find_bt_vlan(0)));
-    } else {
-        return -1;

     }
     }

+#endif

     if (!dev)
         return -1;
 
     if (!dev)
         return -1;
 


@@ -1792,14 +1719,14 @@ static pid_t shutdown_pid;
 static int powerdown_requested;
 static int debug_requested;
 static int suspend_requested;
 static int powerdown_requested;
 static int debug_requested;
 static int suspend_requested;

-static int wakeup_requested;
+static WakeupReason wakeup_reason;

 static NotifierList powerdown_notifiers =
     NOTIFIER_LIST_INITIALIZER(powerdown_notifiers);
 static NotifierList suspend_notifiers =
     NOTIFIER_LIST_INITIALIZER(suspend_notifiers);
 static NotifierList wakeup_notifiers =
     NOTIFIER_LIST_INITIALIZER(wakeup_notifiers);
 static NotifierList powerdown_notifiers =
     NOTIFIER_LIST_INITIALIZER(powerdown_notifiers);
 static NotifierList suspend_notifiers =
     NOTIFIER_LIST_INITIALIZER(suspend_notifiers);
 static NotifierList wakeup_notifiers =
     NOTIFIER_LIST_INITIALIZER(wakeup_notifiers);

-static uint32_t wakeup_reason_mask = ~0;
+static uint32_t wakeup_reason_mask = ~(1 << QEMU_WAKEUP_REASON_NONE);

 static RunState vmstop_requested = RUN_STATE_MAX;
 
 int qemu_shutdown_requested_get(void)
 static RunState vmstop_requested = RUN_STATE_MAX;
 
 int qemu_shutdown_requested_get(void)


@@ -1849,11 +1776,9 @@ static int qemu_suspend_requested(void)
     return r;
 }
 
     return r;
 }
 

-static int qemu_wakeup_requested(void)
+static WakeupReason qemu_wakeup_requested(void)

 {
 {

-    int r = wakeup_requested;
-    wakeup_requested = 0;
-    return r;
+    return wakeup_reason;

 }
 
 static int qemu_powerdown_requested(void)
 }
 
 static int qemu_powerdown_requested(void)


@@ -1970,8 +1895,7 @@ void qemu_system_wakeup_request(WakeupReason reason)
         return;
     }
     runstate_set(RUN_STATE_RUNNING);
         return;
     }
     runstate_set(RUN_STATE_RUNNING);

-    notifier_list_notify(&wakeup_notifiers, &reason);
-    wakeup_requested = 1;
+    wakeup_reason = reason;

     qemu_notify_event();
 }
 
     qemu_notify_event();
 }
 


@@ -2063,6 +1987,8 @@ static bool main_loop_should_exit(void)
         pause_all_vcpus();
         cpu_synchronize_all_states();
         qemu_system_reset(VMRESET_SILENT);
         pause_all_vcpus();
         cpu_synchronize_all_states();
         qemu_system_reset(VMRESET_SILENT);

+        notifier_list_notify(&wakeup_notifiers, &wakeup_reason);
+        wakeup_reason = QEMU_WAKEUP_REASON_NONE;

         resume_all_vcpus();
         monitor_protocol_event(QEVENT_WAKEUP, NULL);
     }
         resume_all_vcpus();
         monitor_protocol_event(QEVENT_WAKEUP, NULL);
     }


@@ -2698,7 +2624,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)


@@ -2899,7 +2825,7 @@ int main(int argc, char **argv, char **envp)
     const char *icount_option = NULL;
     const char *initrd_filename;
     const char *kernel_filename, *kernel_cmdline;
     const char *icount_option = NULL;
     const char *initrd_filename;
     const char *kernel_filename, *kernel_cmdline;

-    const char *boot_order = NULL;
+    const char *boot_order;

     DisplayState *ds;
     int cyls, heads, secs, translation;
     QemuOpts *hda_opts = NULL, *opts, *machine_opts;
     DisplayState *ds;
     int cyls, heads, secs, translation;
     QemuOpts *hda_opts = NULL, *opts, *machine_opts;


@@ -2910,6 +2836,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


@@ -2943,6 +2871,9 @@ int main(int argc, char **argv, char **envp)
     module_call_init(MODULE_INIT_QOM);
 
     qemu_add_opts(&qemu_drive_opts);
     module_call_init(MODULE_INIT_QOM);
 
     qemu_add_opts(&qemu_drive_opts);

+    qemu_add_drive_opts(&qemu_legacy_drive_opts);
+    qemu_add_drive_opts(&qemu_common_drive_opts);
+    qemu_add_drive_opts(&qemu_drive_opts);

     qemu_add_opts(&qemu_chardev_opts);
     qemu_add_opts(&qemu_device_opts);
     qemu_add_opts(&qemu_netdev_opts);
     qemu_add_opts(&qemu_chardev_opts);
     qemu_add_opts(&qemu_device_opts);
     qemu_add_opts(&qemu_netdev_opts);


@@ -2965,9 +2896,10 @@ int main(int argc, char **argv, char **envp)
     runstate_init();
 
     init_clocks();
     runstate_init();
 
     init_clocks();

-    rtc_clock = host_clock;
+    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();


@@ -3279,11 +3211,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;


@@ -3302,7 +3232,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;


@@ -3561,11 +3491,17 @@ 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:
                 do_acpitable_option(opts);
                 break;
             case QEMU_OPTION_smbios:

-                do_smbios_option(optarg);
+                opts = qemu_opts_parse(qemu_find_opts("smbios"), optarg, 0);
+                if (!opts) {
+                    exit(1);
+                }
+                do_smbios_option(opts);

                 break;
             case QEMU_OPTION_enable_kvm:
                 olist = qemu_find_opts("machine");
                 break;
             case QEMU_OPTION_enable_kvm:
                 olist = qemu_find_opts("machine");


@@ -3661,6 +3597,7 @@ int main(int argc, char **argv, char **envp)
                             " Wrong format.\n");
                     exit(1);
                 }
                             " Wrong format.\n");
                     exit(1);
                 }

+                qemu_uuid_set = true;

                 break;
            case QEMU_OPTION_option_rom:
                if (nb_option_roms >= MAX_OPTION_ROMS) {
                 break;
            case QEMU_OPTION_option_rom:
                if (nb_option_roms >= MAX_OPTION_ROMS) {


@@ -3714,7 +3651,9 @@ int main(int argc, char **argv, char **envp)
                 old_param = 1;
                 break;
             case QEMU_OPTION_clock:
                 old_param = 1;
                 break;
             case QEMU_OPTION_clock:

-                configure_alarms(optarg);
+                /* Clock options no longer exist.  Keep this option for
+                 * backward compatibility.
+                 */

                 break;
             case QEMU_OPTION_startdate:
                 configure_rtc_date_offset(optarg, 1);
                 break;
             case QEMU_OPTION_startdate:
                 configure_rtc_date_offset(optarg, 1);


@@ -4111,18 +4050,17 @@ 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");

 
 

-    if (!boot_order) {
-        boot_order = machine->boot_order;
-    }
+    boot_order = machine->default_boot_order;

     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
     if (opts) {
         char *normal_boot_order;
     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
     if (opts) {
         char *normal_boot_order;


@@ -4308,8 +4246,9 @@ int main(int argc, char **argv, char **envp)
 
     qdev_machine_init();
 
 
     qdev_machine_init();
 

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

                                  .kernel_filename = kernel_filename,
                                  .kernel_cmdline = kernel_cmdline,
                                  .initrd_filename = initrd_filename,
                                  .kernel_filename = kernel_filename,
                                  .kernel_cmdline = kernel_cmdline,
                                  .initrd_filename = initrd_filename,


@@ -4341,6 +4280,7 @@ int main(int argc, char **argv, char **envp)
     /* init local displays */
     switch (display_type) {
     case DT_NOGRAPHIC:
     /* init local displays */
     switch (display_type) {
     case DT_NOGRAPHIC:

+        (void)ds;      /* avoid warning if no display is configured */

         break;
 #if defined(CONFIG_CURSES)
     case DT_CURSES:
         break;
 #if defined(CONFIG_CURSES)
     case DT_CURSES:


@@ -4387,8 +4327,8 @@ int main(int argc, char **argv, char **envp)
     }
 #endif
 #ifdef CONFIG_SPICE
     }
 #endif
 #ifdef CONFIG_SPICE

-    if (using_spice && !spice_displays) {
-        qemu_spice_display_init(ds);
+    if (using_spice) {
+        qemu_spice_display_init();

     }
 #endif
 
     }
 #endif
 


@@ -4408,6 +4348,9 @@ int main(int argc, char **argv, char **envp)
     qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
     qemu_run_machine_init_done_notifiers();
 
     qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
     qemu_run_machine_init_done_notifiers();
 

+    /* Done notifiers can load ROMs */
+    rom_load_done();
+

     qemu_system_reset(VMRESET_SILENT);
     if (loadvm) {
         if (load_vmstate(loadvm) < 0) {
     qemu_system_reset(VMRESET_SILENT);
     if (loadvm) {
         if (load_vmstate(loadvm) < 0) {