diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-05-11 18:08:20 -0300 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2010-05-19 12:45:54 -0300 |
| commit | 39b59d2606b3360458361ab0f5419b3262dbf46d (patch) | |
| tree | 0a38cbad3c63f4b383b659e586f13e0a13a3da08 | |
| parent | a691d41a118289e8eb8210e1a824a848497d14a9 (diff) | |
| download | focaccia-qemu-39b59d2606b3360458361ab0f5419b3262dbf46d.tar.gz focaccia-qemu-39b59d2606b3360458361ab0f5419b3262dbf46d.zip | |
Monitor: Return before exiting with 'quit'
This is a new version of the (now reverted) following commit: 0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d The 'quit' Monitor command (implemented by do_quit()) calls exit() directly, this is problematic under QMP because QEMU exits before having a chance to send the ok response. Clients don't know if QEMU exited because of a problem or because the 'quit' command has been executed. This commit fixes that by making do_quit() use qemu_system_shutdown_request(), so that we exit gracefully. Thanks to Paolo Bonzini <pbonzini@redhat.com> for suggesting this solution. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| -rw-r--r-- | monitor.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c index 2e202ffb20..ad50f12edb 100644 --- a/monitor.c +++ b/monitor.c @@ -1020,7 +1020,10 @@ static void do_info_cpu_stats(Monitor *mon) */ static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data) { - exit(0); + monitor_suspend(mon); + no_shutdown = 0; + qemu_system_shutdown_request(); + return 0; } |