diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-03-21 17:42:20 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-03-21 17:42:20 -0500 |
commit | 31b7c261a207e1e670d737ec78a87dd031bd8f73 (patch) | |
tree | ef070dd56c118c8761df7baf0a457fc2c5ff9dfa /vl.c | |
parent | 8b06c62ae48b67b320f7420dcd4854c5559e1532 (diff) | |
parent | dc7a09cfe47679d89289101cc9eb387c45e48fe7 (diff) | |
download | qemu-31b7c261a207e1e670d737ec78a87dd031bd8f73.tar.gz qemu-31b7c261a207e1e670d737ec78a87dd031bd8f73.tar.bz2 qemu-31b7c261a207e1e670d737ec78a87dd031bd8f73.zip |
Merge remote branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1450,6 +1450,7 @@ static void main_loop(void) } if (qemu_reset_requested()) { pause_all_vcpus(); + cpu_synchronize_all_states(); qemu_system_reset(); resume_all_vcpus(); } |