projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb0b3a4) | patch
QMP: Really move the RESET event to qemu_system_reset()
authorLuiz Capitulino <lcapitulino@redhat.com>
Wed, 10 Mar 2010 15:06:34 +0000 (09:06 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 10 Mar 2010 15:06:55 +0000 (09:06 -0600)
commit77e464e971c95799fce94109ce1beee15d0e34bc
tree5928e239269bafba4c6a5c2cd0dccb5abef2cc6ftree | snapshot
parenteb0b3a41ec2c99bec3c7c1f2350d0ddd05e32cf5commit | diff
QMP: Really move the RESET event to qemu_system_reset()

Something bad has happened in the merge of commit 0ee44250, as
the log message says it's supposed to be in qemu_system_reset()
but it is do_vm_stop().

Possibly, it was a problem with the conflict resolution with
ea375f9a (which has been merged first).

This commit moves (again) the RESET event into qemu_system_reset().

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
vl.c diff | blob | history
Domain: SDK / Emulator;