diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-24 09:00:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-24 09:00:24 -0500 |
| commit | 3853528a913f0807170e2c78b6ea692f8515c859 (patch) | |
| tree | 9592f6b3f07aabac6bbbaa0f593750e4d3205e9c /monitor.c | |
| parent | 16f04416175844507b20072c422d08286ebbced6 (diff) | |
| parent | 41836a9f7e4da3a265989d79f35c44f659f7b3cf (diff) | |
| download | focaccia-qemu-3853528a913f0807170e2c78b6ea692f8515c859.tar.gz focaccia-qemu-3853528a913f0807170e2c78b6ea692f8515c859.zip | |
Merge remote branch 'qmp/for-anthony' into staging
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c index a1ebc5d4d2..ad50f12edb 100644 --- a/monitor.c +++ b/monitor.c @@ -1021,7 +1021,9 @@ static void do_info_cpu_stats(Monitor *mon) static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data) { monitor_suspend(mon); - qemu_system_exit_request(); + no_shutdown = 0; + qemu_system_shutdown_request(); + return 0; } |