Merge commit 'b4a3d965dee06d52281496bb5fd0a5cb5534b545' into upstream-merge

* commit 'b4a3d965dee06d52281496bb5fd0a5cb5534b545': (34 commits)
  Stop current VCPU on synchronous reset requests
  Prevent abortion on multiple VCPU kicks
  vmmouse: fix queue_size field initialization
  hpet: make optional
  sysbus: add creation function that may fail
  x86: make vmmouse optional
  isa: add creation function that may fail
  vmmouse: convert to qdev
  vmport: convert to qdev
  x86,MIPS: make vmware_vga optional
  pci: add creation functions that may fail
  qdev: add creation function that may fail
  vmware_vga: refactor device creation
  mst_fpga: Drop one more pxa.h inclusion.
  pxa2xx: convert i2c master to use qdev/vmsd
  max7310: finish qdev'ication
  tosa: we aren't connected to VBus, pass this info to Linux kernel
  mainstone: pass one irq to the mst_fpga instead of the whole PIC
  Drop unnecessary inclusions of pxa.h header
  Add scoop post_load callback that sets IRQs to loaded levels
  ...

Conflicts:
	vl.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/vl.c b/vl.c
index 85c36e3af..879336a2c 100644
--- a/vl.c
+++ b/vl.c
@@ -1312,6 +1312,7 @@ void qemu_system_reset_request(void)
         cpu_single_env->stopped = 1;
         cpu_exit(cpu_single_env);
     }
+    cpu_stop_current();
     qemu_notify_event();
 }