diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-16 08:47:07 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-16 08:47:07 -0600 |
commit | c5d69e6bbf37bf5e3882060764b15e018e6a5321 (patch) | |
tree | e246e96bdfffbc5e07682c5a39ea7a65482a5935 /monitor.c | |
parent | 630ecca0da959e65acad1ee0bf3a631bbb7ee052 (diff) | |
parent | 0ec329dab938e2d97d12a91f8ed15fec27b325e0 (diff) |
Merge remote branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1255,7 +1255,7 @@ static void do_singlestep(Monitor *mon, const QDict *qdict) */ static int do_stop(Monitor *mon, const QDict *qdict, QObject **ret_data) { - vm_stop(EXCP_INTERRUPT); + vm_stop(VMSTOP_USER); return 0; } @@ -2783,7 +2783,7 @@ static void do_loadvm(Monitor *mon, const QDict *qdict) int saved_vm_running = vm_running; const char *name = qdict_get_str(qdict, "name"); - vm_stop(0); + vm_stop(VMSTOP_LOADVM); if (load_vmstate(name) == 0 && saved_vm_running) { vm_start(); |