MAINTAINERS: new maintainers for qapi-schema.json

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 2e0d1a744cf48373a21e74a849c803da2e0a776f..47ab45d37a58009875f6e2324a35f04581d6dea0 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -267,7 +267,6 @@ static NotifierList machine_init_done_notifiers =
     NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers);
 
 static bool tcg_allowed = true;
     NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers);
 
 static bool tcg_allowed = true;

-bool kvm_allowed;

 bool xen_allowed;
 uint32_t xen_domid;
 enum xen_mode xen_mode = XEN_EMULATE;
 bool xen_allowed;
 uint32_t xen_domid;
 enum xen_mode xen_mode = XEN_EMULATE;


@@ -594,6 +593,7 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_RUNNING, RUN_STATE_SAVE_VM },
     { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },
     { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },
     { RUN_STATE_RUNNING, RUN_STATE_SAVE_VM },
     { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },
     { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },

+    { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED },

 
     { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
 
 
     { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
 


@@ -608,6 +608,9 @@ 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_FINISH_MIGRATE },
+

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


@@ -649,6 +652,13 @@ int runstate_is_running(void)
     return runstate_check(RUN_STATE_RUNNING);
 }
 
     return runstate_check(RUN_STATE_RUNNING);
 }
 

+bool runstate_needs_reset(void)
+{
+    return runstate_check(RUN_STATE_INTERNAL_ERROR) ||
+        runstate_check(RUN_STATE_SHUTDOWN) ||
+        runstate_check(RUN_STATE_GUEST_PANICKED);
+}
+

 StatusInfo *qmp_query_status(Error **errp)
 {
     StatusInfo *info = g_malloc0(sizeof(*info));
 StatusInfo *qmp_query_status(Error **errp)
 {
     StatusInfo *info = g_malloc0(sizeof(*info));


@@ -1206,7 +1216,7 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev,
 
     node = g_malloc0(sizeof(FWBootEntry));
     node->bootindex = bootindex;
 
     node = g_malloc0(sizeof(FWBootEntry));
     node->bootindex = bootindex;

-    node->suffix = suffix ? g_strdup(suffix) : NULL;
+    node->suffix = g_strdup(suffix);

     node->dev = dev;
 
     QTAILQ_FOREACH(i, &fw_boot_order, link) {
     node->dev = dev;
 
     QTAILQ_FOREACH(i, &fw_boot_order, link) {


@@ -1222,6 +1232,24 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev,
     QTAILQ_INSERT_TAIL(&fw_boot_order, node, link);
 }
 
     QTAILQ_INSERT_TAIL(&fw_boot_order, node, link);
 }
 

+DeviceState *get_boot_device(uint32_t position)
+{
+    uint32_t counter = 0;
+    FWBootEntry *i = NULL;
+    DeviceState *res = NULL;
+
+    if (!QTAILQ_EMPTY(&fw_boot_order)) {
+        QTAILQ_FOREACH(i, &fw_boot_order, link) {
+            if (counter == position) {
+                res = i->dev;
+                break;
+            }
+            counter++;
+        }
+    }
+    return res;
+}
+

 /*
  * This function returns null terminated string that consist of new line
  * separated device paths.
 /*
  * This function returns null terminated string that consist of new line
  * separated device paths.


@@ -1966,8 +1994,7 @@ static bool main_loop_should_exit(void)
         cpu_synchronize_all_states();
         qemu_system_reset(VMRESET_REPORT);
         resume_all_vcpus();
         cpu_synchronize_all_states();
         qemu_system_reset(VMRESET_REPORT);
         resume_all_vcpus();

-        if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
-            runstate_check(RUN_STATE_SHUTDOWN)) {
+        if (runstate_needs_reset()) {

             runstate_set(RUN_STATE_PAUSED);
         }
     }
             runstate_set(RUN_STATE_PAUSED);
         }
     }


@@ -1995,7 +2022,7 @@ static void main_loop(void)
     int64_t ti;
 #endif
     do {
     int64_t ti;
 #endif
     do {

-        nonblocking = !kvm_enabled() && last_io > 0;
+        nonblocking = !kvm_enabled() && !xen_enabled() && last_io > 0;

 #ifdef CONFIG_PROFILER
         ti = profile_getclock();
 #endif
 #ifdef CONFIG_PROFILER
         ti = profile_getclock();
 #endif


@@ -3214,18 +3241,10 @@ 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:

-                if (!(audio_available())) {
-                    printf("Option %s not supported for this target\n", popt->name);
-                    exit(1);
-                }

                 AUD_help ();
                 exit (0);
                 break;
             case QEMU_OPTION_soundhw:
                 AUD_help ();
                 exit (0);
                 break;
             case QEMU_OPTION_soundhw:

-                if (!(audio_available())) {
-                    printf("Option %s not supported for this target\n", popt->name);
-                    exit(1);
-                }

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


@@ -3347,8 +3366,10 @@ int main(int argc, char **argv, char **envp)
                     break;
                 }
             case QEMU_OPTION_monitor:
                     break;
                 }
             case QEMU_OPTION_monitor:

-                monitor_parse(optarg, "readline");

                 default_monitor = 0;
                 default_monitor = 0;

+                if (strncmp(optarg, "none", 4)) {
+                    monitor_parse(optarg, "readline");
+                }

                 break;
             case QEMU_OPTION_qmp:
                 monitor_parse(optarg, "control");
                 break;
             case QEMU_OPTION_qmp:
                 monitor_parse(optarg, "control");


@@ -4284,6 +4305,8 @@ int main(int argc, char **argv, char **envp)
                                  .cpu_model = cpu_model };
     machine->init(&args);
 
                                  .cpu_model = cpu_model };
     machine->init(&args);
 

+    audio_init();
+

     cpu_synchronize_all_post_init();
 
     set_numa_modes();
     cpu_synchronize_all_post_init();
 
     set_numa_modes();


@@ -4395,7 +4418,6 @@ int main(int argc, char **argv, char **envp)
 
     os_setup_post();
 
 
     os_setup_post();
 

-    resume_all_vcpus();

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